From 1cb667df49f6ab3fd6dc847fc243bbd722f39b16 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Wed, 30 Oct 2019 11:35:59 +0100
Subject: [PATCH 01/35] Update provenance by adding agent and sensors

---
 config/params.php                    |   6 ++
 controllers/DatasetController.php    | 101 +++++++++++++++++++++++----
 models/yiiModels/YiiDatasetModel.php |  20 +++++-
 views/dataset/_form.php              |  74 +++++++++++++++++++-
 4 files changed, 184 insertions(+), 17 deletions(-)

diff --git a/config/params.php b/config/params.php
index 96ffe266..fdceacdf 100755
--- a/config/params.php
+++ b/config/params.php
@@ -38,6 +38,12 @@
     'webServicePageSizeMax' => 2097152,
 
     // ONTOLOGY -----------------------------------------------------------------
+    //-------- Provenance NameSpaces
+    'provenanceNamespaces' => [
+       "prov"=>"http://www.w3.org/ns/prov#",
+       "oeso"=>"http://www.opensilex.org/vocabulary/oeso#",
+       "rdf"=>"http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+       ],
     //-------- Concepts
     'Actuator' => 'http://www.opensilex.org/vocabulary/oeso#Actuator',
     'Lens' => 'http://www.opensilex.org/vocabulary/oeso#Lens',
diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index 03c22cf0..232f3819 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -19,14 +19,14 @@
 use yii\web\Controller;
 use yii\web\UploadedFile;
 use yii\filters\VerbFilter;
-use Exception;
 use app\models\yiiModels\YiiDocumentModel;
 use app\models\wsModels\WSProvenanceModel;
-use app\models\yiiModels\VariableSearch;
 use app\models\wsModels\WSDataModel;
 use app\models\yiiModels\YiiConcernedItemModel;
 use openSILEX\handsontablePHP\adapter\HandsontableSimple;
 use openSILEX\handsontablePHP\classes\ColumnConfig;
+use app\models\wsModels\WSConstants;
+use app\components\helpers\Vocabulary;
 
 require_once '../config/config.php';
 
@@ -50,7 +50,13 @@ class DatasetController extends Controller {
     const ERRORS_LINE = "Line";
     const ERRORS_COLUMN = "Column";
     const ERRORS_MESSAGE = "Message";
+    
+    const SENSORS_DATA = "sensors";
+    const SENSOR_DATA_URI = "sensorUri";
+    const SENSOR_DATA_LABEL = "sensorLabel";
+    const SENSOR_DATA_TYPE = "sensorType";
 
+    const PROVENANCE_PARAMS_VALUES = "provenanceNamespaces";
     /**
      * define the behaviors
      * @return array
@@ -311,7 +317,7 @@ public function actionCreate() {
         $datasetModel = new \app\models\yiiModels\YiiDatasetModel();
         $variablesModel = new \app\models\yiiModels\YiiVariableModel();
 
-        $token = Yii::$app->session['access_token'];
+        $token = Yii::$app->session[WSConstants::ACCESS_TOKEN];
 
         // Load existing variables
         $variables = $variablesModel->getInstancesDefinitionsUrisAndLabel($token);
@@ -321,7 +327,15 @@ public function actionCreate() {
         $provenanceService = new WSProvenanceModel();
         $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
         $this->view->params["provenances"] = $provenances;
-
+        
+        // Load existing sensors
+        $sensors = $this->getSensorsUrisTypesLabels($token);
+        $this->view->params["sensingDevices"] = $this->getSensorListToShowFromSensorList($sensors);
+
+         // Load existing agents
+        $userModel = new \app\models\yiiModels\YiiUserModel();
+        $users = $userModel->getPersonsMailsAndName($token);
+        $this->view->params['agents'] = $users;
         //If the form is complete, register data
         if ($datasetModel->load(Yii::$app->request->post())) {
             //Store uploaded CSV file
@@ -339,12 +353,13 @@ public function actionCreate() {
 
             // Check CSV header with variables
             if (array_slice($csvHeaders, 2) === $givenVariables) {
-
                 // Get selected or create Provenance URI
                 if (!array_key_exists($datasetModel->provenanceUri, $provenances)) {
                     $provenanceUri = $this->createProvenance(
                             $datasetModel->provenanceUri,
-                            $datasetModel->provenanceComment
+                            $datasetModel->provenanceComment,
+                            $datasetModel->provenanceSensingDevices,
+                            $datasetModel->provenanceAgents
                     );
                     $datasetModel->provenanceUri = $provenanceUri;
                     $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
@@ -435,20 +450,36 @@ public function actionCreate() {
 
     /**
      * Create provenance from an alias and a comment
-     * @param type $alias
-     * @param type $comment
+     * @param type $alias label of the provenance
+     * @param type $comment comment linked to the provenance
+     * @param type $sensingDevice uri of the sensor
+     * @param String $agent uri of the agent
      * @return boolean
      */
-    private function createProvenance($alias, $comment) {
+    private function createProvenance($alias, $comment,$sensingDevice = null, $agent =null) {
         $provenanceService = new WSProvenanceModel();
         $date = new \DateTime();
+        $metadata = [
+            "namespaces" => Yii::$app->params[self::PROVENANCE_PARAMS_VALUES],
+            "creationDate" => $date->format("Y-m-d\TH:i:sO"),
+            "prov:Agent" =>[
+                "oeso:SensingDevice" => [
+                ],
+                "oeso:Operator" => [
+                ]
+              ],
+            ];
+        if($sensingDevice != null){
+            $metadata["prov:Agent"]["oeso:SensingDevice"] = $sensingDevice;
+        }
+        if($sensingDevice != null){
+            $metadata["prov:Agent"]["oeso:Operator"] = $agent;
+        }
         $provenanceUri = $provenanceService->createProvenance(
                 Yii::$app->session['access_token'],
                 $alias,
                 $comment,
-                [
-                    "creationDate" => $date->format("Y-m-d\TH:i:sO")
-                ]
+                $metadata
         );
 
         if (is_string($provenanceUri) && $provenanceUri != "token") {
@@ -492,5 +523,49 @@ private function linkDocumentsToProvenance($provenanceUri, $documents) {
             return true;
         }
     }
-
+    
+    /**
+     * Gets all sensors.
+     * @return sensors 
+     */
+    public function getSensorsUrisTypesLabels() {
+        $model = new \app\models\yiiModels\SensorSearch();
+        $model->page = 0;
+        $model->pageSize = 10000;
+        $sensorsUrisTypesLabels = [];
+        $sensors = $model->search(Yii::$app->session[WSConstants::ACCESS_TOKEN], null);
+        if ($sensors === WSConstants::TOKEN_INVALID) {
+            return WSConstants::TOKEN_INVALID;
+        } else {
+            foreach ($sensors->models as $sensor) {
+                $sensorsUrisTypesLabels[] =
+                    [
+                        self::SENSOR_DATA_URI => $sensor->uri,
+                        self::SENSOR_DATA_LABEL => $sensor->label,
+                        self::SENSOR_DATA_TYPE => $sensor->rdfType
+                    ];
+            }
+        }
+        return $sensorsUrisTypesLabels;
+    }
+    
+    /**
+     * 
+     * @param type $sensorsUriTypesLabel
+     * @return array
+     */
+    public function getSensorListToShowFromSensorList($sensorsUriTypesLabel) {
+        $sensorLabelListToShow = [];
+        foreach ($sensorsUriTypesLabel as $sensorUriTypesLabel) {
+            $sensorType = Vocabulary::prettyUri($sensorUriTypesLabel[self::SENSOR_DATA_TYPE]);
+            if (isset($sensorLabelListToShow[$sensorType])) {
+                $sensorLabelListToShow[$sensorType][$sensorUriTypesLabel[self::SENSOR_DATA_URI]] = $sensorUriTypesLabel[self::SENSOR_DATA_LABEL];
+            } else {
+                $sensorLabelListToShow[$sensorType] = [
+                $sensorUriTypesLabel[self::SENSOR_DATA_URI] => $sensorUriTypesLabel[self::SENSOR_DATA_LABEL]
+                ];
+            }
+        }
+        return $sensorLabelListToShow;
+    }
 }
diff --git a/models/yiiModels/YiiDatasetModel.php b/models/yiiModels/YiiDatasetModel.php
index 2cb084af..ae03f17b 100755
--- a/models/yiiModels/YiiDatasetModel.php
+++ b/models/yiiModels/YiiDatasetModel.php
@@ -25,8 +25,8 @@
 class YiiDatasetModel extends WSActiveRecord {
 
     /**
-     * Uri de la provenance
-     * @var type 
+     * Provenance uri
+     * @var string 
      */
     public $provenanceUri;
     
@@ -73,6 +73,18 @@ class YiiDatasetModel extends WSActiveRecord {
      * @var file
      */
     public $file;
+    
+     /**
+     * Sensor uris
+     * @var array 
+     */
+    public $provenanceSensingDevices;
+    
+      /**
+     * Agent uris
+     * @var array 
+     */
+    public $provenanceAgents;
 
     const PROVENANCE = "provenance";
     const DATA = "data";
@@ -95,6 +107,8 @@ public function __construct($pageSize = null, $page = null) {
     public function rules() {
         return [
             [['variables', 'provenanceAlias', 'file', 'provenanceUri'], 'required'],
+            [['provenanceSensingDevices'], 'safe'],
+            [['provenanceAgents'], 'safe'],
             [['provenanceComment'], 'string'],
             [['provenanceUri', 'provenanceComment', 'documentsURIs', 'data', 'file'], 'safe'],
             [['file'], 'file', 'extensions' => 'csv']
@@ -109,6 +123,8 @@ public function attributeLabels() {
         return [
             'provenanceUri' => Yii::t('app', 'Provenance (URI)'),
             'provenanceComment' => Yii::t('app', 'Provenance comment'),
+            'provenanceSensingDevices' => Yii::t('app', 'Sensor'),
+            'provenanceAgents' => Yii::t('app', 'Agent'),
             'variables' => Yii::t('app', 'Variable(s)'),
             'file' => Yii::t('app', 'Data file'),
             'documentsUris' => Yii::t('app', 'Documents')
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index b9215a2a..e59aeb1e 100755
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -111,11 +111,16 @@
                 echo 'var documentsLoadUri = "' . Url::to(['document/get-documents-widget']) . '";';
                 // Inject provenances list indexed by URI
                 echo 'var provenances = ' . json_encode($this->params['provenances']) . ';';
+                 // Inject sensingDevices list indexed by URI
+                echo 'var sensingDevices = ' . json_encode($this->params['sensingDevices']) . ';';
+                 // Inject agents list indexed by URI
+                echo 'var agents = ' . json_encode($this->params['agents']) . ';';
             ?>
                 
             // Function to update provenance comment field depending of selected URI
             var updateProvenanceFields = function(uri) {
                 if (provenances.hasOwnProperty(uri)) {
+//                    console.log(provenances[uri]);
                     // If selected provenance is known get its comment
                     var comment = provenances[uri]["comment"];
                     
@@ -125,12 +130,54 @@
                         .removeClass("has-error")
                         .removeClass("has-success");
                     $(".field-yiidatasetmodel-provenancecomment .help-block").empty();
-
+                    
+                    // Set provenance provenanceSensingDevices, disable input and remove validation messages 
+                    try {
+                        var provenanceSensingDevices = provenances[uri]["metadata"]["prov:Agent"]["oeso:SensingDevice"];
+                        $("#yiidatasetmodel-provenancesensingdevices").val(provenanceSensingDevices);
+                        $("#yiidatasetmodel-provenancesensingdevices").trigger("change");
+//                        console.log(provenanceSensingDevices);
+                    }
+                    catch(error) {
+                        $("#yiidatasetmodel-provenancesensingdevices").val([]);
+                        $("#yiidatasetmodel-provenancesensingdevices").trigger("change");
+                        console.log("No sensing device set");
+                    }finally {
+                        $("#yiidatasetmodel-provenancesensingdevices").val(provenanceSensingDevices).attr("disabled", "disabled");
+                        $(".field-yiidatasetmodel-provenancesensingdevices, .field-yiidatasetmodel-provenancesensingdevices *")
+                            .removeClass("has-error")
+                            .removeClass("has-success");
+                        $(".field-yiidatasetmodel-provenancesensingdevices .help-block").empty();
+                    }
+                    // Set provenance provenanceSensingDevices, disable input and remove validation messages 
+                    try {
+                        var provenanceAgents = provenances[uri]["metadata"]["prov:Agent"]["oeso:Operator"];
+                        $("#yiidatasetmodel-provenanceagents").val(provenanceAgents);
+                        $("#yiidatasetmodel-provenanceagents").trigger("change");
+//                        console.log(provenanceAgents);
+                    }
+                    catch(error) {
+                         $("#yiidatasetmodel-provenanceagents").val([]);
+                         $("#yiidatasetmodel-provenanceagents").trigger("change");
+                         console.log("No agents set");
+                    }finally {
+                        $("#yiidatasetmodel-provenanceagents").val(agents).attr("disabled", "disabled");
+                        $(".field-yiidatasetmodel-provenanceagents, .field-yiidatasetmodel-provenanceagents *")
+                            .removeClass("has-error")
+                            .removeClass("has-success");
+                        $(".field-yiidatasetmodel-provenanceagents .help-block").empty();
+                    }
                     // Load linked documents
                     $("#already-linked-documents").load(documentsLoadUri, {
                         "uri": uri
                     })
                 } else {
+                    // Otherwise clear provenance comment and enable input
+                    $("#yiidatasetmodel-provenancesensingdevices").val(sensingDevices).removeAttr("disabled").trigger("change");
+                    
+                    // Otherwise clear provenance comment and enable input
+                    $("#yiidatasetmodel-provenanceagents").val(agents).removeAttr("disabled").trigger("change");
+                    
                     // Otherwise clear provenance comment and enable input
                     $("#yiidatasetmodel-provenancecomment").val("").removeAttr("disabled");
                     
@@ -160,9 +207,32 @@
                     'tags' => true
                 ],
             ]); ?>
+
+      <?= $form->field($model, 'provenanceSensingDevices')->widget(\kartik\select2\Select2::classname(),[
+                'data' => $this->params['sensingDevices'],
+                'options' => [
+                    'placeholder' => Yii::t('app/messages', 'Select existing device') . ' ...',
+                    'multiple' => true
+                ],
+                'pluginOptions' => [
+                    'allowClear' => false,
+                    'tags' => true
+                ],
+            ]); ?>
     
-    <?= $form->field($model, 'provenanceComment')->textarea(['rows' => 6]) ?>
+    <?= $form->field($model, 'provenanceAgents')->widget(\kartik\select2\Select2::classname(),[
+                'data' => $this->params['agents'],
+                'options' => [
+                    'placeholder' => 'Select operator ...',
+                    'multiple' => true
+                ],
+                'pluginOptions' => [
+                    'allowClear' => true
+                ],
+            ]); ?>
 
+    <?= $form->field($model, 'provenanceComment')->textarea(['rows' => 6]) ?>
+    
     <h3><?= Yii::t('app', 'Linked Document(s)') ?></h3>
     <div id="already-linked-documents"></div>
    <?=  $form->field($model, 'documentsURIs')->widget(MultipleInput::className(), [

From fff143a4395a51eb8d24def34dba011daa320941 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Wed, 6 Nov 2019 18:23:26 +0100
Subject: [PATCH 02/35] Update add sensor data

---
 controllers/ActuatorController.php            |   2 +-
 controllers/DatasetController.php             | 163 +++++++
 controllers/SensorController.php              |   6 +-
 models/wsModels/WSDataModel.php               |   6 +
 models/wsModels/WSProvenanceModel.php         |  40 ++
 models/wsModels/WSSensorModel.php             |  71 +++
 models/yiiModels/DeviceDataSearch.php         |  38 +-
 views/dataset/_form_on_sensor.php             | 428 ++++++++++++++++++
 views/dataset/create.php                      |   0
 views/dataset/create_on_sensor.php            |  35 ++
 views/layouts/main.php                        |   6 +-
 views/sensor/_view_sensor_graph.php           |  25 +-
 .../DatasetFiles/coma/datasetExemple.csv      |   0
 .../coma/datasetSensorExemple.csv             |   1 +
 .../coma/datasetSensorTemplate.csv            |   1 +
 .../semicolon/datasetSensorExemple.csv        |   8 +
 .../semicolon/datasetSensorTemplate.csv       |   1 +
 17 files changed, 809 insertions(+), 22 deletions(-)
 create mode 100644 views/dataset/_form_on_sensor.php
 mode change 100755 => 100644 views/dataset/create.php
 create mode 100755 views/dataset/create_on_sensor.php
 mode change 100644 => 100755 web/documents/DatasetFiles/coma/datasetExemple.csv
 create mode 100644 web/documents/DatasetFiles/coma/datasetSensorExemple.csv
 create mode 100644 web/documents/DatasetFiles/coma/datasetSensorTemplate.csv
 create mode 100644 web/documents/DatasetFiles/semicolon/datasetSensorExemple.csv
 create mode 100644 web/documents/DatasetFiles/semicolon/datasetSensorTemplate.csv

diff --git a/controllers/ActuatorController.php b/controllers/ActuatorController.php
index abfa54c1..100758a7 100644
--- a/controllers/ActuatorController.php
+++ b/controllers/ActuatorController.php
@@ -354,7 +354,7 @@ public function actionSearchData() {
             
             // Get data
             $sessionToken = Yii::$app->session['access_token'];
-            $actuatorGraphData = $searchModel->getEnvironmentData($sessionToken);
+            $actuatorGraphData = $searchModel->getSensorData($sessionToken);
             
             // Render data
             return $this->renderAjax('_view_actuator_graph', [
diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index 232f3819..6d30fece 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -141,6 +141,30 @@ public function actionGenerateAndDownloadDatasetCreationFile() {
         fputcsv($file, $fileColumns, $delimiter = Yii::$app->params['csvSeparator']);
         fclose($file);
     }
+    
+    /**
+     * generate the csv file for the sensor dataset creation action. The csv file is
+     * generated with a column for each variable
+     * @param array variables list of the variables to add to the 
+     *                                file uri => alias
+     * @return mixed
+     */
+    public function actionGenerateAndDownloadDatasetSensorCreationFile() {
+        $fileColumns[] = DatasetController::DATE;
+        $variables = Yii::$app->request->post('variables');
+        foreach ($variables as $variableAlias) {
+            $fileColumns[] = $variableAlias;
+        }
+
+        $csvPath = "coma";
+        if (Yii::$app->params['csvSeparator'] == ";") {
+            $csvPath = "semicolon";
+        }
+        
+        $file = fopen('./documents/DatasetFiles/' . $csvPath . '/datasetSensorTemplate.csv', 'w');
+        fputcsv($file, $fileColumns, $delimiter = Yii::$app->params['csvSeparator']);
+        fclose($file);
+    }
 
     /**
      * 
@@ -447,6 +471,145 @@ public function actionCreate() {
             ]);
         }
     }
+    
+    /**
+     * register the sensor data with the associated provenance and documents
+     * @return mixed
+     */
+    public function actionCreateOnSensor() {
+        $datasetModel = new \app\models\yiiModels\YiiDatasetModel();
+        $variablesModel = new \app\models\yiiModels\YiiVariableModel();
+
+        $token = Yii::$app->session[WSConstants::ACCESS_TOKEN];
+
+        // Load existing variables
+        $variables = $variablesModel->getInstancesDefinitionsUrisAndLabel($token);
+        $this->view->params["variables"] = $this->getVariablesListLabelToShowFromVariableList($variables);
+
+        // Load existing provenances
+        $provenanceService = new WSProvenanceModel();
+        $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
+        $this->view->params["provenances"] = $provenances;
+        
+        // Load existing sensors
+        $sensors = $this->getSensorsUrisTypesLabels($token);
+        $this->view->params["sensingDevices"] = $this->getSensorListToShowFromSensorList($sensors);
+
+         // Load existing agents
+        $userModel = new \app\models\yiiModels\YiiUserModel();
+        $users = $userModel->getPersonsMailsAndName($token);
+        $this->view->params['agents'] = $users;
+        //If the form is complete, register data
+        if ($datasetModel->load(Yii::$app->request->post())) {
+            //Store uploaded CSV file
+            $document = UploadedFile::getInstance($datasetModel, 'file');
+            $serverFilePath = \config::path()['documentsUrl'] . "DatasetFiles/" . $document->name;
+            $document->saveAs($serverFilePath);
+
+            //Read CSV file content
+            $fileContent = str_getcsv(file_get_contents($serverFilePath), "\n");
+            $csvHeaders = str_getcsv(array_shift($fileContent), Yii::$app->params['csvSeparator']);
+            unlink($serverFilePath);
+
+            //Loaded given variables
+            $givenVariables = $datasetModel->variables;
+
+            // Check CSV header with variables
+            if (array_slice($csvHeaders, 1) === $givenVariables) {
+                // Get selected or create Provenance URI
+                if (!array_key_exists($datasetModel->provenanceUri, $provenances)) {
+                    $provenanceUri = $this->createProvenance(
+                            $datasetModel->provenanceUri,
+                            $datasetModel->provenanceComment,
+                            $datasetModel->provenanceSensingDevices,
+                            $datasetModel->provenanceAgents
+                    );
+                    $datasetModel->provenanceUri = $provenanceUri;
+                    $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
+                    $this->view->params["provenances"] = $provenances;
+                } else {
+                    $provenanceUri = $datasetModel->provenanceUri;
+                }
+
+                // If provenance sucessfully created
+                if ($provenanceUri) {
+                    // Link uploaded documents to provenance URI
+                    $linkDocuments = true;
+                    if (is_array($datasetModel->documentsURIs) && is_array($datasetModel->documentsURIs["documentURI"])) {
+                        $linkDocuments = $this->linkDocumentsToProvenance(
+                                $provenanceUri,
+                                $datasetModel->documentsURIs["documentURI"]
+                        );
+                    }
+
+                    $datasetModel->documentsURIs = null;
+                      
+                    if ($linkDocuments === true) {
+                        // Save CSV data linked to provenance URI
+                        $values = [];
+                        $scientifObjectUri = null;
+                        foreach ($fileContent as $rowStr) {
+                            $row = str_getcsv($rowStr, Yii::$app->params['csvSeparator']);
+                            $date = $row[0];
+                            for ($i = 1; $i < count($row); $i++) {
+                                $values[] = [
+                                    "provenanceUri" => $provenanceUri,
+                                    "objectUri" => $scientifObjectUri,
+                                    "variableUri" => array_search($givenVariables[$i - 1], $variables),
+                                    "date" => $date,
+                                    "value" => $row[$i]
+                                ];
+                            }
+                        }
+                        
+                        $dataService = new WSDataModel();
+                        $result = $dataService->post($token, "/", $values);
+//                        var_dump($result);exit;
+                        // If data successfully saved
+                        if (is_array($result->metadata->datafiles) && count($result->metadata->datafiles) > 0) {
+                            $arrayData = $this->csvToArray($fileContent);
+                            return $this->render('_form_dataset_created', [
+                                        'model' => $datasetModel,
+                                        'handsontable' => $this->generateHandsontableDataset($csvHeaders, $arrayData),
+                                        'insertedDataNumber' => count($arrayData)
+                            ]);
+                        } else {
+
+                            return $this->render('create_on_sensor', [
+                                        'model' => $datasetModel,
+                                        'errors' => $result->metadata->status
+                            ]);
+                        }
+                    } else {
+                        return $this->render('create_on_sensor', [
+                                    'model' => $datasetModel,
+                                    'errors' => [
+                                        Yii::t("app/messages", "Error while creating linked documents")
+                                    ]
+                        ]);
+                    }
+                } else {
+                    return $this->render('create_on_sensor', [
+                                'model' => $datasetModel,
+                                'errors' => [
+                                    Yii::t("app/messages", "Error while creating provenance")
+                                ]
+                    ]);
+                }
+            } else {
+                return $this->render('create_on_sensor', [
+                            'model' => $datasetModel,
+                            'errors' => [
+                                Yii::t("app/messages", "CSV file headers does not match selected variables")
+                            ]
+                ]);
+            }
+        } else {
+            return $this->render('create_on_sensor', [
+                        'model' => $datasetModel,
+            ]);
+        }
+    }
 
     /**
      * Create provenance from an alias and a comment
diff --git a/controllers/SensorController.php b/controllers/SensorController.php
index d5b781a8..67e3bba1 100644
--- a/controllers/SensorController.php
+++ b/controllers/SensorController.php
@@ -33,6 +33,7 @@
  * @update [Vincent Migot] 7 November, 2018: Add sensor/variables link
  * @update [Vincent Migot] 19 November, 2018: Add visualization of environmental data
  * @update [Andréas Garcia] 11 March, 2019: Add event widget
+ * @update [Arnaud Charleroy] 30 October, 2019: Add sensor data by data service
  * @author Morgane Vidal <morgane.vidal@inra.fr>
  * @author Arnaud Charleroy <arnaud.charleroy@inra.fr>
  */
@@ -312,7 +313,7 @@ public function actionView($id) {
         //get sensor's linked documents
         $searchDocumentModel = new DocumentSearch();
         $searchDocumentModel->concernedItemFilter = $id;
-        $documents = $searchDocumentModel->search(Yii::$app->session['access_token'], ["concernedItem" => $id]);
+        $documents = $searchDocumentModel->search(Yii::$app->session[WSConstants::ACCESS_TOKEN], ["concernedItem" => $id]);
         
         //3. get sensor annotations
         $searchAnnotationModel = new AnnotationSearch();
@@ -541,8 +542,7 @@ public function actionSearchData() {
             
             // Get data
             $sessionToken = Yii::$app->session[WSConstants::ACCESS_TOKEN];
-            $sensorGraphData = $searchModel->getEnvironmentData($sessionToken);
-            
+            $sensorGraphData = $searchModel->getSensorData($sessionToken);
             // Render data
             return $this->renderAjax('_view_sensor_graph', [
                 'sensorGraphData' => $sensorGraphData
diff --git a/models/wsModels/WSDataModel.php b/models/wsModels/WSDataModel.php
index 8cdbc79b..00ffada8 100644
--- a/models/wsModels/WSDataModel.php
+++ b/models/wsModels/WSDataModel.php
@@ -19,6 +19,12 @@
  */
 class WSDataModel extends\openSILEX\guzzleClientPHP\WSModel {
     
+     /**
+     * Date format for the webservice filters with timezone
+     * @example: 2017-05-03T12:35:00+2000
+     */
+    const DATE_FORMAT = "Y-m-d\TH:i:sO";
+    
     /**
      * initialize access to the projects service. Calls super constructor
      */
diff --git a/models/wsModels/WSProvenanceModel.php b/models/wsModels/WSProvenanceModel.php
index e1e7c13c..5d06a79e 100644
--- a/models/wsModels/WSProvenanceModel.php
+++ b/models/wsModels/WSProvenanceModel.php
@@ -54,6 +54,46 @@ public function createProvenance($sessionToken, $label, $comment, $metadata) {
         }
     }
 
+    /**
+     * Return an array of existing provenances match with criteria
+     * 
+     * @param string $sessionToken
+     * @param array $userCriteria array of citeria
+     * @return type
+     */
+    public function getSpecificProvenancesByCriteria($sessionToken,$userCriteria = []) {
+        $pageSize = 200;
+        $subService = "/";
+        $params = array_merge($userCriteria,[
+            WSConstants::PAGE => 0,
+            WSConstants::PAGE_SIZE => $pageSize
+        ]);
+       
+        $provenanceResult = $this->get($sessionToken, $subService, $params);
+        
+        if (isset($provenanceResult->{WSConstants::METADATA}->{WSConstants::PAGINATION}) && isset($provenanceResult->{WSConstants::METADATA}->{WSConstants::PAGINATION}->{WSConstants::TOTAL_COUNT}) && $provenanceResult->{WSConstants::METADATA}->{WSConstants::PAGINATION}->{WSConstants::TOTAL_COUNT} > 0) {
+
+            $result = $provenanceResult->{WSConstants::RESULT}->{WSConstants::DATA};
+
+            $totalPages = $provenanceResult->{WSConstants::METADATA}->{WSConstants::PAGINATION}->{WSConstants::TOTAL_PAGES};
+
+            for ($currentPage = 1; $currentPage < $totalPages; $currentPage++) {
+                $params[WSConstants::PAGE] = $currentPage;
+                $params[WSConstants::PAGE_SIZE] = $pageSize;
+                
+                $provenanceResult = $this->get($sessionToken, $subService, $params);
+                
+                $result = array_merge($result, $provenanceResult->{WSConstants::RESULT}->{WSConstants::DATA});
+            }
+            
+            return $result;
+        }elseif(isset($provenanceResult->{WSConstants::RESULT}->{WSConstants::DATA})){
+            return  $provenanceResult->{WSConstants::RESULT}->{WSConstants::DATA};
+        }else{
+            return [];
+        }
+    }
+    
     /**
      * Return an array of all existing provenances
      * 
diff --git a/models/wsModels/WSSensorModel.php b/models/wsModels/WSSensorModel.php
index ed50d656..317764a3 100644
--- a/models/wsModels/WSSensorModel.php
+++ b/models/wsModels/WSSensorModel.php
@@ -117,4 +117,75 @@ public function putSensorVariables($sessionToken, $sensorUri, $variablesUri) {
             return $requestRes;
         }
     }
+    
+     /**
+     * Return the latest measured value for a variable and a sensor
+     * @param string $sessionToken
+     * @param string $provenanceUri
+     * @param string $variableUri
+     * @return mixed data or the error message 
+     */
+    public function getLastSensorVariableData($sessionToken,$variableUri, $sensorUri) {
+        // Define the parameter array
+        $params = [
+            "pageSize" => 1,
+            "page" => 0,
+            "variable" => $variableUri,
+            "dateSortAsc" => "false"
+        ];
+        $subService = "/" . urlencode($sensorUri) . "/data";
+        // Send the request
+        $requestRes = $this->get($sessionToken, $subService, $params);
+        // Return the first result data or null
+        if (isset($requestRes->{WSConstants::RESULT}->{WSConstants::DATA}))  {
+            if (count($requestRes->{WSConstants::RESULT}->{WSConstants::DATA}) > 0) {
+                return (array) $requestRes->{WSConstants::RESULT}->{WSConstants::DATA}[0];
+            } else {
+                return null;
+            }
+            
+        } else {
+            return $requestRes;
+        }
+    }
+    
+    
+    /**
+     * Return the 80000 first measured variable corresponding to the given parameters
+     * @param string $sessionToken
+     * @param string $sensorUri
+     * @param string $variableUri
+     * @param \DateTime $startDate
+     * @param \DateTime $endDate
+     * @return mixed data or the error message 
+     */
+    public function getAllSensorData($sessionToken, $sensorUri, $variableUri, $startDate, $endDate) {
+        // Define the parameter array
+        $params = [
+            "pageSize" => 80000,
+            "page" => 0,
+            "variable" => $variableUri,
+        ];
+        $subService = "/" . urlencode($sensorUri) . "/data";
+        
+        if ($startDate != null) {
+            $params["startDate"] = $startDate->format(WSDataModel::DATE_FORMAT);
+        }
+
+        if ($endDate != null) {
+            $params["endDate"] = $endDate->format(WSDataModel::DATE_FORMAT);
+        }
+        
+        $params["dateSortAsc"] = "true";
+        
+        // Send the request
+        $requestRes = $this->get($sessionToken, $subService, $params);
+        
+        // Return the result data
+        if (isset($requestRes->{WSConstants::RESULT}->{WSConstants::DATA}))  {
+            return (array) $requestRes->{WSConstants::RESULT}->{WSConstants::DATA};
+        } else {
+            return $requestRes;
+        }
+    }
 }
\ No newline at end of file
diff --git a/models/yiiModels/DeviceDataSearch.php b/models/yiiModels/DeviceDataSearch.php
index 04fceba6..341cd04c 100644
--- a/models/yiiModels/DeviceDataSearch.php
+++ b/models/yiiModels/DeviceDataSearch.php
@@ -10,7 +10,6 @@
 
 namespace app\models\yiiModels;
 use Yii;
-use \app\models\wsModels\WSEnvironmentModel;
 
 /**
  * implements the search action for the sensor data
@@ -47,6 +46,11 @@ class DeviceDataSearch extends \yii\base\Model {
      */
     public $graphName;
     
+    /**
+     * Store provenance data to prevent multiple calls to WS
+     */
+    const SESSION_PROVENANCES = 'store_provenances_infos';
+    
     /**
      * @inheritdoc
      */
@@ -90,18 +94,25 @@ public function attributeLabels() {
      *      ]
      *  ]
      */
-    public function getEnvironmentData($sessionToken) {
+    public function getSensorData($sessionToken) {
+        // Session provenance
+        $sessionProvenances = Yii::$app->session[self::SESSION_PROVENANCES];
+        if(!isset($sessionProvenances)){
+            $sessionProvenances = [];
+        }
         // Create webservice instance
-        $ws = new WSEnvironmentModel();
+        $wsData = new \app\models\wsModels\WSSensorModel();
+        $wsProv = new \app\models\wsModels\WSProvenanceModel();
         
         // Define start and end time period
         $dateTimeStart = null;
         $dateTimeEnd = null;
         
         if ($this->dateStart == null && $this->dateEnd == null) {
+            $date = null;
+            $lastData = $wsData->getLastSensorVariableData($sessionToken, $this->variableURI, $this->sensorURI);
             // If no dates are defined get the last data for this sensor and variable
-            $lastData = $ws->getLastSensorVariableData($sessionToken, $this->sensorURI, $this->variableURI);
-        
+            
             // Get the last date if exists
             $lastDate = null;
             if ($lastData['date']) {
@@ -121,6 +132,7 @@ public function getEnvironmentData($sessionToken) {
             } else {
                 return null;
             }
+
         } else if ($this->dateStart == null) {
             // If only dateEnd is defined
             $dateTimeEnd = new \DateTime($this->dateEnd);
@@ -132,10 +144,17 @@ public function getEnvironmentData($sessionToken) {
             $dateTimeStart = new \DateTime($this->dateStart);
             $dateTimeEnd = new \DateTime($this->dateEnd);
         }
-        
+
         // Get all data
-        $data = $ws->getAllSensorData($sessionToken, $this->sensorURI, $this->variableURI, $dateTimeStart, $dateTimeEnd);
-                
+        $data = $wsData->getAllSensorData($sessionToken, $this->sensorURI, $this->variableURI, $dateTimeStart, $dateTimeEnd);
+        // Get specific associated provenance
+        foreach ($data as $d){
+            if(!isset($sessionProvenances[$d->provenanceUri])){
+                $specificProvenancesData = $wsProv->getSpecificProvenancesByCriteria($sessionToken,['uri' => $d->provenanceUri] );
+                $sessionProvenances[$d->provenanceUri] = $specificProvenancesData[0];
+                $d->provenanceLabel = $specificProvenancesData[0]->label;
+            }
+        }
         // Construct result
         $result = [
             "graphName" => $this->graphName,
@@ -143,7 +162,8 @@ public function getEnvironmentData($sessionToken) {
             "sensorUri" => $this->sensorURI,
             "dateStart" => $dateTimeStart,
             "dateEnd" => $dateTimeEnd,
-            "data" => $data
+            "data" => $data,
+            "provenances" => $sessionProvenances
         ];
         
         return $result;
diff --git a/views/dataset/_form_on_sensor.php b/views/dataset/_form_on_sensor.php
new file mode 100644
index 00000000..831e76fb
--- /dev/null
+++ b/views/dataset/_form_on_sensor.php
@@ -0,0 +1,428 @@
+<?php
+
+//**********************************************************************************************
+//                                       _form.php
+//
+// Author(s): Morgane VIDAL
+// PHIS-SILEX version 1.0
+// Copyright © - INRA - 2017
+// Creation date: October 2017
+// Contact: morgane.vidal@inra.fr, anne.tireau@inra.fr, pascal.neveu@inra.fr
+// Last modification date:  January, 15 2018 (multiple variables dataset)
+// Subject: creation of dataset via CSV
+//***********************************************************************************************
+
+use Yii;
+use yii\helpers\Html;
+use unclead\multipleinput\MultipleInput;
+use kartik\form\ActiveForm;
+use kartik\file\FileInput;
+use yii\helpers\Url;
+
+/* @var $this yii\web\View */
+/* @var $model app\models\YiiDatasetModel */
+/* @var $form yii\widgets\ActiveForm */
+/* @var $handsontable openSILEX\handsontablePHP\adapter\HandsontableSimple */
+/* @var $handsontableErrorsCellsSettings string */
+
+ if ($handsontable !== null) {
+     echo $handsontable->loadJSLibraries(true);
+     echo $handsontable->loadCSSLibraries();
+ }
+
+?>
+
+<div class="dataset-form well">
+    <?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]); ?>
+
+    <?= Yii::$app->session->getFlash('renderArray'); ?>
+
+    <?php
+        if (isset($errors) && $errors !== null):
+    ?>
+    <div class="alert alert-danger" >
+        <h3 style="margin:3%;">Errors found in dataset :</h3>
+        <ul>
+        <?php 
+            // Display error messages
+            $errorMessages = [];
+            foreach($errors as $error) {
+                if (is_string($error)) {
+                    $errorMessages[] =  $error;
+                } else {
+                    $errorMessages[] =  $error->exception->details;
+                }
+            }
+            
+            $errorMessages = array_unique($errorMessages);
+            foreach ($errorMessages as $errorMessage) {
+                 echo '<li>' . $errorMessage . '</li>';
+            }
+            
+        ?>
+        </ul>
+    </div>
+    <?php
+        endif;
+    ?>
+    <?php
+        if (isset($handsontable) && $handsontable !== null):
+    ?>
+        <div id="errors">
+
+            <h3 class="alert alert-danger" style="margin:3%;">Errors found in dataset </h3>
+
+                <div id="<?= $handsontable->getContainerName() ?>">
+                </div>
+                <script>
+                    <?= $handsontable->generateJavascriptCode(); ?>
+                    <?= $handsontableErrorsCellsSettings; ?>
+                </script>
+
+        </div>
+
+        <h3 class="alert alert-info" style="margin:3%;">Add dataset form</h3>
+    <?php endif; ?>
+    
+    <?= $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(),[
+                'data' => $this->params['variables'],
+                'options' => [
+                    'placeholder' => Yii::t('app/messages', 'Select one or many variables') . ' ...',
+                    'id' => 'uriVariable-selector',
+                    'multiple' => true
+                ],
+                'pluginOptions' => [
+                    'allowClear' => true,
+                    'tags' => true
+                ],
+            ]); ?>
+
+    <hr style="border-color : gray;"/>
+    <h3><?= Yii::t('app', 'Provenance')?></h3>
+
+    <script>
+        $(document).ready(function() {
+            <?php
+                // Create Provenance select values array
+                foreach ($this->params['provenances'] as $uri => $provenance) {
+                    $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
+                }
+                // Inject URI to get document widget linked to an URI
+                echo 'var documentsLoadUri = "' . Url::to(['document/get-documents-widget']) . '";';
+                // Inject provenances list indexed by URI
+                echo 'var provenances = ' . json_encode($this->params['provenances']) . ';';
+                 // Inject sensingDevices list indexed by URI
+                echo 'var sensingDevices = ' . json_encode($this->params['sensingDevices']) . ';';
+                 // Inject agents list indexed by URI
+                echo 'var agents = ' . json_encode($this->params['agents']) . ';';
+            ?>
+                
+            // Function to update provenance comment field depending of selected URI
+            var updateProvenanceFields = function(uri) {
+                if (provenances.hasOwnProperty(uri)) {
+//                    console.log(provenances[uri]);
+                    // If selected provenance is known get its comment
+                    var comment = provenances[uri]["comment"];
+                    
+                    // Set provenance comment, disable input and remove validation messages 
+                    $("#yiidatasetmodel-provenancecomment").val(comment).attr("disabled", "disabled");
+                    $(".field-yiidatasetmodel-provenancecomment, .field-yiidatasetmodel-provenancecomment *")
+                        .removeClass("has-error")
+                        .removeClass("has-success");
+                    $(".field-yiidatasetmodel-provenancecomment .help-block").empty();
+                    
+                    // Set provenance provenanceSensingDevices, disable input and remove validation messages 
+                    try {
+                        var provenanceSensingDevices = provenances[uri]["metadata"]["prov:Agent"]["oeso:SensingDevice"];
+                        $("#yiidatasetmodel-provenancesensingdevices").val(provenanceSensingDevices);
+                        $("#yiidatasetmodel-provenancesensingdevices").trigger("change");
+//                        console.log(provenanceSensingDevices);
+                    }
+                    catch(error) {
+                        $("#yiidatasetmodel-provenancesensingdevices").val([]);
+                        $("#yiidatasetmodel-provenancesensingdevices").trigger("change");
+                        console.log("No sensing device set");
+                    }finally {
+                        $("#yiidatasetmodel-provenancesensingdevices").val(provenanceSensingDevices).attr("disabled", "disabled");
+                        $(".field-yiidatasetmodel-provenancesensingdevices, .field-yiidatasetmodel-provenancesensingdevices *")
+                            .removeClass("has-error")
+                            .removeClass("has-success");
+                        $(".field-yiidatasetmodel-provenancesensingdevices .help-block").empty();
+                    }
+                    // Set provenance provenanceSensingDevices, disable input and remove validation messages 
+                    try {
+                        var provenanceAgents = provenances[uri]["metadata"]["prov:Agent"]["oeso:Operator"];
+                        $("#yiidatasetmodel-provenanceagents").val(provenanceAgents);
+                        $("#yiidatasetmodel-provenanceagents").trigger("change");
+//                        console.log(provenanceAgents);
+                    }
+                    catch(error) {
+                         $("#yiidatasetmodel-provenanceagents").val([]);
+                         $("#yiidatasetmodel-provenanceagents").trigger("change");
+                         console.log("No agents set");
+                    }finally {
+                        $("#yiidatasetmodel-provenanceagents").val(agents).attr("disabled", "disabled");
+                        $(".field-yiidatasetmodel-provenanceagents, .field-yiidatasetmodel-provenanceagents *")
+                            .removeClass("has-error")
+                            .removeClass("has-success");
+                        $(".field-yiidatasetmodel-provenanceagents .help-block").empty();
+                    }
+                    // Load linked documents
+                    $("#already-linked-documents").load(documentsLoadUri, {
+                        "uri": uri
+                    })
+                } else {
+                    // Otherwise clear provenance comment and enable input
+                    $("#yiidatasetmodel-provenancesensingdevices").val(sensingDevices).removeAttr("disabled").trigger("change");
+                    
+                    // Otherwise clear provenance comment and enable input
+                    $("#yiidatasetmodel-provenanceagents").val(agents).removeAttr("disabled").trigger("change");
+                    
+                    // Otherwise clear provenance comment and enable input
+                    $("#yiidatasetmodel-provenancecomment").val("").removeAttr("disabled");
+                    
+                    // Clear linked documents list
+                    $("#already-linked-documents").empty();
+                }    
+            }
+            
+            // On provenance change update provenance fields
+            $("#provenance-selector").change(function() {
+                updateProvenanceFields($(this).val());
+            });
+            
+            // Update provenance fields depending of startup value
+            updateProvenanceFields($("#provenance-selector").val());
+        });
+    </script>
+    <?= $form->field($model, 'provenanceUri')->widget(\kartik\select2\Select2::classname(),[
+                'data' => $provenancesArray,
+                'options' => [
+                    'placeholder' => Yii::t('app/messages', 'Select existing provenance or create a new one') . ' ...',
+                    'id' => 'provenance-selector',
+                    'multiple' => false
+                ],
+                'pluginOptions' => [
+                    'allowClear' => true,
+                    'tags' => true
+                ],
+            ]); ?>
+
+      <?= $form->field($model, 'provenanceSensingDevices')->widget(\kartik\select2\Select2::classname(),[
+                'data' => $this->params['sensingDevices'],
+                'options' => [
+                    'placeholder' => Yii::t('app/messages', 'Select existing device') . ' ...',
+                    'multiple' => true
+                ],
+                'pluginOptions' => [
+                    'allowClear' => false,
+                    'tags' => true
+                ],
+            ]); ?>
+    
+    <?= $form->field($model, 'provenanceAgents')->widget(\kartik\select2\Select2::classname(),[
+                'data' => $this->params['agents'],
+                'options' => [
+                    'placeholder' => 'Select operator ...',
+                    'multiple' => true
+                ],
+                'pluginOptions' => [
+                    'allowClear' => true
+                ],
+            ]); ?>
+
+    <?= $form->field($model, 'provenanceComment')->textarea(['rows' => 6]) ?>
+    
+    <h3><?= Yii::t('app', 'Linked Document(s)') ?></h3>
+    <div id="already-linked-documents"></div>
+   <?=  $form->field($model, 'documentsURIs')->widget(MultipleInput::className(), [
+        'max'               => 6,
+        'allowEmptyList'    => true,
+        'enableGuessTitle'  => true,
+        'columns' => [
+            [
+                'name' => 'documentURI',
+                'options' => [
+                  'readonly' => true,
+                  'style' => 'background-color:#C4DAE7;',
+                 ]
+            ]
+        ],
+        'addButtonOptions' => [
+            'class' => 'btn btn-primary buttonDocuments',
+            'label' => Yii::t('app', 'Add Document')
+        ],
+    ])->label(false)
+    ?>
+
+
+
+    <hr style="border-color : gray;"/>
+
+      <div class="alert alert-info" role="alert">
+        <b><?= Yii::t('app/messages', 'File Rules')?> : </b>
+        <ul>
+            <li><?= Yii::t('app/messages', 'CSV separator must be')?> "<b><?= Yii::$app->params['csvSeparator']?></b>"</li>
+            <li><?= Yii::t('app/messages', 'Decimal separator for numeric values must be')?> "<b>.</b>"</li>
+        </ul>
+        <br/>
+        <b><?= Yii::t('app', 'Columns')?> : </b>
+        <table class="table table-hover" id="dataset-csv-columns-desc">
+            <tr>
+                <th style="color:red">Date *</th>
+                <td><p><?= Yii::t('app/messages', 'Acquisition date of the data') ?> (format ISO 8601: YYYY-MM-DD or YYYY-MM-DDTHH:mm:ssZ) </p> </td>
+            </tr>
+             <tr class="dataset-variables">
+                <th style="color:red">Value *</th>
+                <td ><?= Yii::t('app', 'Value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)</td>
+            </tr>
+        </table>
+    </div>
+
+    <p>
+        <?php 
+            $csvPath = "coma";
+            if (Yii::$app->params['csvSeparator'] == ";") {
+                $csvPath = "semicolon";
+            }
+        ?>
+        <i><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Template'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetSensorTemplate.csv', ['id' => 'datasetSensorTemplate']) ?></i>
+        <i style="float: right"><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Example'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetSensorExemple.csv') ?></i>
+    </p>
+    <?= $form->field($model, 'file')->widget(FileInput::classname(), [
+        'options' => [
+            'maxFileSize' => 2000,
+            'pluginOptions'=>['allowedFileExtensions'=>['csv'],'showUpload' => false],
+        ]
+    ]);
+    ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('yii' , 'Create') , ['class' => 'btn btn-success']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+    <div class="modal fade" id="document-modal" tabindex="-1" role="dialog" aria-labelledby="document-modal-title">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    <h4 class="modal-title" id="document-modal-title"><?php echo Html::encode(Yii::t('app', 'Create Document')); ?></h4>
+                </div>
+                <div class="modal-body">
+                    <div id="document-content"></div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-success" id="document-save"><?php echo Html::encode(Yii::t('yii', 'Create')) ?></button>
+                     <button type="button" class="btn btn-default modal-close" data-dismiss="modal"><?php echo Html::encode(Yii::t('yii', 'Close')) ?></button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+    $(document).ready(function(){
+        // Load document add form popin
+        $('#document-content').load('<?php echo Url::to(['document/create-from-dataset']) ?>');
+        
+        var documentUploaded = false;
+        // Clear last uploaded document line if document add form is canceled
+        $('#document-modal').on('hidden.bs.modal', function () {
+            if (!documentUploaded) {
+                $(".js-input-remove:last").click();
+            }
+            documentUploaded = false;
+            
+            $('#document-content form').trigger('reset');
+
+            $('#document-save-msg').parent().removeClass('alert-danger');
+            $('#document-save-msg').parent().addClass('alert-info');
+            $('#document-save-msg').html('<?php echo Yii::t('app/messages', 'Request text'); ?>');
+        });
+
+        $(document).on('change', '#uriVariable-selector', function() {
+            $(".dataset-variables").remove();
+              $("#uriVariable-selector :selected").each(function (i,sel) {
+                    $('#dataset-csv-columns-desc').append(
+                            '<tr class="dataset-variables">'
+                                + '<th style="color:red" >'
+                                    + $(sel).text() + ' *'
+                                + '</th>'
+                                + '<td>'
+                                    + '<?php echo Yii::t("app/messages", "Value"); ?> (<?php echo Yii::t('app', 'Real number, String or Date'); ?>)'
+                                + '</td>'
+                            + '</tr>');
+                  });
+        });
+
+        // Initial document count
+        var nbDocuments = -1;
+        $(document).on('click', '#document-save', function () {
+                // On save get document form values
+                var formData = new FormData();
+                var file_data = $('#document-content #yiidocumentmodel-file').prop('files')[0];
+                formData.append('file', file_data);
+                var other_data = $('form').serializeArray();
+                $.each(other_data, function(key, input) {
+                    formData.append(input.name, input.value);
+                });
+
+                // Send documents form
+                $.ajax({
+                    url: 'index.php?r=document%2Fcreate-from-dataset',
+                    type: 'POST',
+                    processData: false,
+                    datatype: 'json',
+                    contentType: false,
+                    data: formData
+
+                })
+                .done(function (data) {
+                    // Add document URI and close document add form
+                    $('#yiidatasetmodel-documentsuris-documenturi-' + nbDocuments).val(data);
+                    documentUploaded = true;
+                    $('#document-modal').modal('toggle');
+
+                })
+                .fail(function (jqXHR, textStatus) {
+                    // Disaply errors
+                    $('#document-save-msg').parent().removeClass('alert-info');
+                    $('#document-save-msg').parent().addClass('alert-danger');
+                    $('#document-save-msg').html('Request failed: ' + textStatus);
+                });
+                
+                return false;
+        });
+
+        // Open document add form on click
+        $('.buttonDocuments').click(function() {
+            nbDocuments++;
+            typeInsertedDocument = "document";
+            $('#document-modal').modal('toggle');
+        });
+
+        // Download adjusted to variables CSV template file on click
+        $(document).on('change', '#uriVariable-selector', function () {
+            var variablesLabels = [];
+            $("#uriVariable-selector :selected").each(function (i,sel) {
+                variablesLabels.push($(sel).text());
+              });
+            $.ajax({
+                url: 'index.php?r=dataset%2Fgenerate-and-download-dataset-sensor-creation-file',
+                type: 'POST',
+                datatype: 'json',
+                data: {variables: variablesLabels}
+            })
+                    .done(function (data) {
+                    })
+                    .fail(function (jqXHR, textStatus) {
+                        $('#document-save-msg').parent().removeClass('alert-info');
+                        $('#document-save-msg').parent().addClass('alert-danger');
+                        $('#document-save-msg').html('Request failed: ' + textStatus);
+                    });
+        });
+
+    });
+    </script>
+</div>
diff --git a/views/dataset/create.php b/views/dataset/create.php
old mode 100755
new mode 100644
diff --git a/views/dataset/create_on_sensor.php b/views/dataset/create_on_sensor.php
new file mode 100755
index 00000000..f68c659c
--- /dev/null
+++ b/views/dataset/create_on_sensor.php
@@ -0,0 +1,35 @@
+<?php
+
+//**********************************************************************************************
+//                                       create.php 
+//
+// Author(s): Morgane VIDAL
+// PHIS-SILEX version 1.0
+// Copyright © - INRA - 2017
+// Creation date: October 2017
+// Contact: morgane.vidal@inra.fr, anne.tireau@inra.fr, pascal.neveu@inra.fr
+// Last modification date:  October, 4 2017
+// Subject: creatin dataset by CSV
+//***********************************************************************************************
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model app\models\YiiDatasetModel */
+/* @var $handsontable openSILEX\handsontablePHP\adapter\HandsontableSimple */
+/* @var $handsontableErrorsCellsSettings string */
+
+$this->title = Yii::t('app', 'Add Data on sensor');
+//$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Dataset', ['n' => 2]), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="dataset-create_on_sensor">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?= $this->render('_form_on_sensor', [
+        'model' => $model,
+        'errors' => $errors,
+        'handsontable' => isset($handsontable) ? $handsontable : null,
+        'handsontableErrorsCellsSettings' =>  isset($handsontableErrorsCellsSettings) ? $handsontableErrorsCellsSettings : null
+    ]) ?>
+</div>
diff --git a/views/layouts/main.php b/views/layouts/main.php
index 1b7efcd6..63c8b882 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -107,9 +107,13 @@
                             'label' => Yii::t('app', 'Data'),
                             'items' => [
                                 [
-                                    'label' => Icon::show('plus', ['class' => 'fa-large'], Icon::FA) . " " . Yii::t('app', 'Add'),
+                                    'label' => Icon::show('plus', ['class' => 'fa-large'], Icon::FA) . " " . Yii::t('app', 'Add on scientific object'),
                                     'url' => ['/dataset/create']
                                 ],
+                                [
+                                    'label' => Icon::show('plus', ['class' => 'fa-large'], Icon::FA) . " " . Yii::t('app', 'Add only on sensor'),
+                                    'url' => ['/dataset/create-on-sensor']
+                                ],
                                 [
                                     'label' => Icon::show('search', ['class' => 'fa-large'], Icon::FA) . " " . Yii::t('app', 'View'),
                                     'url' => ['/data/index']
diff --git a/views/sensor/_view_sensor_graph.php b/views/sensor/_view_sensor_graph.php
index a7037aa5..908b467d 100644
--- a/views/sensor/_view_sensor_graph.php
+++ b/views/sensor/_view_sensor_graph.php
@@ -23,19 +23,28 @@
  *      ]
  * ]
  */
-$serie = [
-    "name" => $sensorGraphData["graphName"],
-    "data" => []
-];
 
+$series = [];
+
+foreach( $sensorGraphData["provenances"] as $provenance) {
+    $series[$provenance->uri]= [
+            "name" => $provenance->label,
+            "data" => []
+        ];
+}
+
+//Create an array of data to store serie data by uri
+//array(1) { ["http://www.opensilex.org/sunagri/id/provenance/1572430583192"]=> array(2) { 
+//["name"]=> string(25) "new provs agent + sensor2" ["data"]=> array(0) { } } }
 if (is_array($sensorGraphData['data'])) {
     foreach ($sensorGraphData['data'] as $data) {
-        $serie['data'][] = [(strtotime($data->date))*1000, $data->value ];
+        $series[$data->provenanceUri]['data'][] = [(strtotime($data->date))*1000, $data->value ];
     }
-
+    //format data  - remove uri key
+    $series = array_values($series);
+    
     // Display Hightchart widget
     echo Highcharts::widget([
-        
         // Create a unique ID for each graph based on variable URI
         'id' => base64_encode($sensorGraphData["variableUri"]),
         'options' => [
@@ -54,7 +63,7 @@
             'tooltip' => [
                'xDateFormat' => '%Y-%m-%d %H:%M'
              ],
-            'series' => [$serie],
+            'series' => $series,
         ]
     ]);
 }
diff --git a/web/documents/DatasetFiles/coma/datasetExemple.csv b/web/documents/DatasetFiles/coma/datasetExemple.csv
old mode 100644
new mode 100755
diff --git a/web/documents/DatasetFiles/coma/datasetSensorExemple.csv b/web/documents/DatasetFiles/coma/datasetSensorExemple.csv
new file mode 100644
index 00000000..9a90a77c
--- /dev/null
+++ b/web/documents/DatasetFiles/coma/datasetSensorExemple.csv
@@ -0,0 +1 @@
+Date,GlobalRadiation_InstantGlobalRadiation_WattPerSquareMeter,WindSpeed_TenMinutesMaxWindSpeed_MeterPerSecond
diff --git a/web/documents/DatasetFiles/coma/datasetSensorTemplate.csv b/web/documents/DatasetFiles/coma/datasetSensorTemplate.csv
new file mode 100644
index 00000000..8b823655
--- /dev/null
+++ b/web/documents/DatasetFiles/coma/datasetSensorTemplate.csv
@@ -0,0 +1 @@
+Date,Variable
diff --git a/web/documents/DatasetFiles/semicolon/datasetSensorExemple.csv b/web/documents/DatasetFiles/semicolon/datasetSensorExemple.csv
new file mode 100644
index 00000000..d5701a87
--- /dev/null
+++ b/web/documents/DatasetFiles/semicolon/datasetSensorExemple.csv
@@ -0,0 +1,8 @@
+Date;trait-1_method-A_dimensionless-unit;trait-2_method-B_dimensionless-unit;trait-3_method-C_dimensionless-unit
+2019-09-12T15:51:00Z;2019-09-12;"red";-12
+2019-09-13T12:51:00Z;2019-09-13;"red";13e12
+2019-09-14T18:51:00Z;2019-09-14;"red";-0.000000000000000141
+2019-09-15T10:51:00Z;2019-09-15;"blue";-0.15
+2019-09-16T09:51:00Z;2019-09-16;"red";16
+2019-09-17T08:51:30Z;2019-09-17;"blue";17
+
diff --git a/web/documents/DatasetFiles/semicolon/datasetSensorTemplate.csv b/web/documents/DatasetFiles/semicolon/datasetSensorTemplate.csv
new file mode 100644
index 00000000..a9e4e9dd
--- /dev/null
+++ b/web/documents/DatasetFiles/semicolon/datasetSensorTemplate.csv
@@ -0,0 +1 @@
+Date;Value
\ No newline at end of file

From 1b49226da07aa27683ebb57ae85e2643b25fc3e5 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Fri, 8 Nov 2019 09:43:41 +0100
Subject: [PATCH 03/35] Update dataset form

---
 controllers/DatasetController.php    | 41 +++++++++++++++++++++++++---
 models/yiiModels/YiiDatasetModel.php | 16 ++++++++---
 views/dataset/_form.php              | 18 ++++++++++--
 3 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index 6d30fece..063f73fa 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -27,6 +27,7 @@
 use openSILEX\handsontablePHP\classes\ColumnConfig;
 use app\models\wsModels\WSConstants;
 use app\components\helpers\Vocabulary;
+use app\models\yiiModels\YiiExperimentModel;
 
 require_once '../config/config.php';
 
@@ -42,7 +43,7 @@ class DatasetController extends Controller {
     //create a global configuration file for the csv files
     //\SILEX:TODO
 
-    const AGRONOMICAL_OBJECT_URI = "ScientificObjectURI";
+    const AGRONOMICAL_OBJECT_URI = "ScientificObjectAlias";
     const DATE = "Date";
     const VALUE = "Value";
     const ERRORS_MISSING_COLUMN = "Missing Columns";
@@ -360,6 +361,12 @@ public function actionCreate() {
         $userModel = new \app\models\yiiModels\YiiUserModel();
         $users = $userModel->getPersonsMailsAndName($token);
         $this->view->params['agents'] = $users;
+        
+        // Load experiments
+        $experimentModel = new YiiExperimentModel();
+        $experiments =  $experimentModel->getExperimentsURIAndLabelList($token);
+        $this->view->params['experiments'] = $experiments;
+        
         //If the form is complete, register data
         if ($datasetModel->load(Yii::$app->request->post())) {
             //Store uploaded CSV file
@@ -402,15 +409,32 @@ public function actionCreate() {
                                 $datasetModel->documentsURIs["documentURI"]
                         );
                     }
-
+                    // Load all objectsl inked to an experiment
+                    
+                    $SciencitificObjectSearch = new \app\models\yiiModels\ScientificObjectSearch();
+                    $SciencitificObjectSearch->experiment = $datasetModel->experiment;
+                    $result = $SciencitificObjectSearch->search($token, [WSConstants::PAGE_SIZE => 50000]);
+                   
+                    $objectUris = [];
+                    foreach ($result->getModels() as $object){
+                        $objectUris[$object->uri]=$object->label;
+                    }
                     $datasetModel->documentsURIs = null;
 
                     if ($linkDocuments === true) {
+                        $objectsErrors = [];
                         // Save CSV data linked to provenance URI
                         $values = [];
                         foreach ($fileContent as $rowStr) {
                             $row = str_getcsv($rowStr, Yii::$app->params['csvSeparator']);
-                            $scientifObjectUri = $row[0];
+                            $scientifObjectAlias = $row[0];
+                            if(!array_search($scientifObjectAlias, $objectUris)){
+                                $objectsErrors[] = $scientifObjectAlias .  Yii::t("app/messages", " Object doesn't not exists in this experiment");
+                                $scientifObjectUri = null;
+                            }else{
+                                $scientifObjectUri = array_search($scientifObjectAlias, $objectUris);
+                            }
+                              var_dump($datasetModel->experiment,$scientifObjectAlias,$scientifObjectUri);
                             $date = $row[1];
                             for ($i = 2; $i < count($row); $i++) {
                                 $values[] = [
@@ -422,7 +446,16 @@ public function actionCreate() {
                                 ];
                             }
                         }
-
+                        
+                        if(!empty($objectsErrors)){
+                            return $this->render('create', [
+                                'model' => $datasetModel,
+                                'errors' => $objectsErrors
+                                    ]
+                            );
+                        }
+                       
+                        
                         $dataService = new WSDataModel();
                         $result = $dataService->post($token, "/", $values);
 
diff --git a/models/yiiModels/YiiDatasetModel.php b/models/yiiModels/YiiDatasetModel.php
index ae03f17b..1d8f96ef 100755
--- a/models/yiiModels/YiiDatasetModel.php
+++ b/models/yiiModels/YiiDatasetModel.php
@@ -74,17 +74,23 @@ class YiiDatasetModel extends WSActiveRecord {
      */
     public $file;
     
-     /**
+    /**
      * Sensor uris
      * @var array 
      */
     public $provenanceSensingDevices;
     
-      /**
+    /**
      * Agent uris
      * @var array 
      */
     public $provenanceAgents;
+    
+    /**
+     * Experiment uri
+     * @var string 
+     */
+    public $experiment;
 
     const PROVENANCE = "provenance";
     const DATA = "data";
@@ -106,10 +112,11 @@ public function __construct($pageSize = null, $page = null) {
      */
     public function rules() {
         return [
-            [['variables', 'provenanceAlias', 'file', 'provenanceUri'], 'required'],
+            [['variables', 'provenanceAlias', 'file', 'provenanceUri','experiment'], 'required'],
             [['provenanceSensingDevices'], 'safe'],
             [['provenanceAgents'], 'safe'],
             [['provenanceComment'], 'string'],
+            [['experiment'], 'string'],
             [['provenanceUri', 'provenanceComment', 'documentsURIs', 'data', 'file'], 'safe'],
             [['file'], 'file', 'extensions' => 'csv']
         ];
@@ -127,7 +134,8 @@ public function attributeLabels() {
             'provenanceAgents' => Yii::t('app', 'Agent'),
             'variables' => Yii::t('app', 'Variable(s)'),
             'file' => Yii::t('app', 'Data file'),
-            'documentsUris' => Yii::t('app', 'Documents')
+            'documentsUris' => Yii::t('app', 'Documents'),
+            'experiment' => Yii::t('app', 'Experiment')
         ];
     }
 
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index e59aeb1e..42407d5a 100755
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -83,7 +83,19 @@
 
         <h3 class="alert alert-info" style="margin:3%;">Add dataset form</h3>
     <?php endif; ?>
-    
+    <?= $form->field($model, 'experiment')->widget(\kartik\select2\Select2::classname(),[
+                'data' => $this->params['experiments'],
+                'options' => [
+                    'placeholder' => Yii::t('app/messages', 'Select one experiment') . ' ...',
+                    'id' => 'experiment-selector',
+                    'multiple' => false
+                ],
+                'pluginOptions' => [
+                    'allowClear' => true,
+                    'tags' => true
+                ],
+            ]); ?>
+        
     <?= $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(),[
                 'data' => $this->params['variables'],
                 'options' => [
@@ -269,8 +281,8 @@
         <b><?= Yii::t('app', 'Columns')?> : </b>
         <table class="table table-hover" id="dataset-csv-columns-desc">
             <tr>
-                <th style="color:red">ScientificObjectURI *</th>
-                <td><?= Yii::t('app/messages', 'The URI of the scientific object (e.g http://www.phenome-fppn.fr/phenovia/2017/o1028649)')?></td>
+                <th style="color:red">ScientificObjectAlias *</th>
+                <td><?= Yii::t('app/messages', 'The ALIAS of the scientific object for the choosen experiment (e.g MTP_WW_2019_P050_SH1_2018_LF14)')?></td>
             </tr>
             <tr>
                 <th style="color:red">Date *</th>

From ad60e23eb9a6a38133e0c31cb7eb0ed2f88f1cb2 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Fri, 8 Nov 2019 14:40:15 +0100
Subject: [PATCH 04/35] User uri saved into provenance

---
 controllers/DatasetController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index 063f73fa..979e3e3a 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -359,7 +359,7 @@ public function actionCreate() {
 
          // Load existing agents
         $userModel = new \app\models\yiiModels\YiiUserModel();
-        $users = $userModel->getPersonsMailsAndName($token);
+        $users = $userModel->getPersonsURIAndName($token);
         $this->view->params['agents'] = $users;
         
         // Load experiments

From 2989c3b7cf88a94c09ce4be638a4b556dfe3f2cf Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Fri, 8 Nov 2019 14:42:39 +0100
Subject: [PATCH 05/35] rename operator

---
 models/yiiModels/YiiDatasetModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/yiiModels/YiiDatasetModel.php b/models/yiiModels/YiiDatasetModel.php
index 1d8f96ef..23f02d62 100755
--- a/models/yiiModels/YiiDatasetModel.php
+++ b/models/yiiModels/YiiDatasetModel.php
@@ -131,7 +131,7 @@ public function attributeLabels() {
             'provenanceUri' => Yii::t('app', 'Provenance (URI)'),
             'provenanceComment' => Yii::t('app', 'Provenance comment'),
             'provenanceSensingDevices' => Yii::t('app', 'Sensor'),
-            'provenanceAgents' => Yii::t('app', 'Agent'),
+            'provenanceAgents' => Yii::t('app', 'Operator'),
             'variables' => Yii::t('app', 'Variable(s)'),
             'file' => Yii::t('app', 'Data file'),
             'documentsUris' => Yii::t('app', 'Documents'),

From 9ef8f43833b87529281da94828e18a0ec601ed67 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Tue, 12 Nov 2019 15:43:20 +0100
Subject: [PATCH 06/35] Correct sensor data contorller

---
 controllers/DatasetController.php       |  2 +-
 models/yiiModels/YiiDataSensorModel.php | 37 +++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 models/yiiModels/YiiDataSensorModel.php

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index 6d30fece..2d00ad01 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -477,7 +477,7 @@ public function actionCreate() {
      * @return mixed
      */
     public function actionCreateOnSensor() {
-        $datasetModel = new \app\models\yiiModels\YiiDatasetModel();
+        $datasetModel = new \app\models\yiiModels\YiiDataSensorModel();
         $variablesModel = new \app\models\yiiModels\YiiVariableModel();
 
         $token = Yii::$app->session[WSConstants::ACCESS_TOKEN];
diff --git a/models/yiiModels/YiiDataSensorModel.php b/models/yiiModels/YiiDataSensorModel.php
new file mode 100644
index 00000000..486c4f18
--- /dev/null
+++ b/models/yiiModels/YiiDataSensorModel.php
@@ -0,0 +1,37 @@
+<?php
+
+//**********************************************************************************************
+//                                       YiiDatasetModel.php 
+//
+// Author(s): Morgane VIDAL
+// PHIS-SILEX version 1.0
+// Copyright © - INRA - 2017
+// Creation date: October 2017
+// Contact: morgane.vidal@inra.fr, anne.tireau@inra.fr, pascal.neveu@inra.fr
+// Last modification date:  October, 2 2017
+// Subject: The Yii model for the dataset. Used with web services
+//***********************************************************************************************
+
+namespace app\models\yiiModels;
+
+use Yii;
+use app\models\yiiModels\YiiDatasetModel;
+use app\models\wsModels\WSDatasetModel;
+
+/**
+ * Model for the dataset. Used with web services
+ * @author Morgane Vidal <morgane.vidal@inra.fr>
+ */
+class YiiDataSensorModel extends YiiDatasetModel {
+
+  /**
+     * 
+     * @return array the rules of the attributes
+     */
+    public function rules() {
+        $rules =  parent::rules();
+        $rules[] =[['provenanceSensingDevices'], 'required'];
+        return $rules;
+    }
+
+}

From 4c6260f48ed36db24c4e253d9243b10b05dfd4bc Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Tue, 12 Nov 2019 15:51:46 +0100
Subject: [PATCH 07/35] Remove sensor from dataset update

---
 controllers/DatasetController.php |  2 +-
 views/dataset/_form.php           | 37 ++-----------------------------
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index fccd94db..60f16e21 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -668,7 +668,7 @@ private function createProvenance($alias, $comment,$sensingDevice = null, $agent
         if($sensingDevice != null){
             $metadata["prov:Agent"]["oeso:SensingDevice"] = $sensingDevice;
         }
-        if($sensingDevice != null){
+        if($agent != null){
             $metadata["prov:Agent"]["oeso:Operator"] = $agent;
         }
         $provenanceUri = $provenanceService->createProvenance(
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index 42407d5a..6638b397 100755
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -143,25 +143,7 @@
                         .removeClass("has-success");
                     $(".field-yiidatasetmodel-provenancecomment .help-block").empty();
                     
-                    // Set provenance provenanceSensingDevices, disable input and remove validation messages 
-                    try {
-                        var provenanceSensingDevices = provenances[uri]["metadata"]["prov:Agent"]["oeso:SensingDevice"];
-                        $("#yiidatasetmodel-provenancesensingdevices").val(provenanceSensingDevices);
-                        $("#yiidatasetmodel-provenancesensingdevices").trigger("change");
-//                        console.log(provenanceSensingDevices);
-                    }
-                    catch(error) {
-                        $("#yiidatasetmodel-provenancesensingdevices").val([]);
-                        $("#yiidatasetmodel-provenancesensingdevices").trigger("change");
-                        console.log("No sensing device set");
-                    }finally {
-                        $("#yiidatasetmodel-provenancesensingdevices").val(provenanceSensingDevices).attr("disabled", "disabled");
-                        $(".field-yiidatasetmodel-provenancesensingdevices, .field-yiidatasetmodel-provenancesensingdevices *")
-                            .removeClass("has-error")
-                            .removeClass("has-success");
-                        $(".field-yiidatasetmodel-provenancesensingdevices .help-block").empty();
-                    }
-                    // Set provenance provenanceSensingDevices, disable input and remove validation messages 
+                    // Set provenance provenanceAgents, disable input and remove validation messages 
                     try {
                         var provenanceAgents = provenances[uri]["metadata"]["prov:Agent"]["oeso:Operator"];
                         $("#yiidatasetmodel-provenanceagents").val(provenanceAgents);
@@ -184,10 +166,7 @@
                         "uri": uri
                     })
                 } else {
-                    // Otherwise clear provenance comment and enable input
-                    $("#yiidatasetmodel-provenancesensingdevices").val(sensingDevices).removeAttr("disabled").trigger("change");
-                    
-                    // Otherwise clear provenance comment and enable input
+                    // Otherwise clear provenance agents and enable input
                     $("#yiidatasetmodel-provenanceagents").val(agents).removeAttr("disabled").trigger("change");
                     
                     // Otherwise clear provenance comment and enable input
@@ -219,18 +198,6 @@
                     'tags' => true
                 ],
             ]); ?>
-
-      <?= $form->field($model, 'provenanceSensingDevices')->widget(\kartik\select2\Select2::classname(),[
-                'data' => $this->params['sensingDevices'],
-                'options' => [
-                    'placeholder' => Yii::t('app/messages', 'Select existing device') . ' ...',
-                    'multiple' => true
-                ],
-                'pluginOptions' => [
-                    'allowClear' => false,
-                    'tags' => true
-                ],
-            ]); ?>
     
     <?= $form->field($model, 'provenanceAgents')->widget(\kartik\select2\Select2::classname(),[
                 'data' => $this->params['agents'],

From 1e6d3bc5acb6a7140b7884d5bde8bb23ecb6ae04 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Wed, 13 Nov 2019 18:31:35 +0100
Subject: [PATCH 08/35] Remove var_dump

---
 controllers/DatasetController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index 60f16e21..0c94cd60 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -434,7 +434,6 @@ public function actionCreate() {
                             }else{
                                 $scientifObjectUri = array_search($scientifObjectAlias, $objectUris);
                             }
-                              var_dump($datasetModel->experiment,$scientifObjectAlias,$scientifObjectUri);
                             $date = $row[1];
                             for ($i = 2; $i < count($row); $i++) {
                                 $values[] = [

From d7398e24f285f792bea565642a3073eaba10d155 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Wed, 13 Nov 2019 19:01:45 +0100
Subject: [PATCH 09/35] Add pageSizeLimit to 30000

---
 controllers/DatasetController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index 0c94cd60..bb592c73 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -413,8 +413,9 @@ public function actionCreate() {
                     
                     $SciencitificObjectSearch = new \app\models\yiiModels\ScientificObjectSearch();
                     $SciencitificObjectSearch->experiment = $datasetModel->experiment;
-                    $result = $SciencitificObjectSearch->search($token, [WSConstants::PAGE_SIZE => 50000]);
-                   
+                    $SciencitificObjectSearch->pageSize = 30000;
+                    $result = $SciencitificObjectSearch->search($token);
+
                     $objectUris = [];
                     foreach ($result->getModels() as $object){
                         $objectUris[$object->uri]=$object->label;

From 3f01b976b180753da2954204d45a1569e589c938 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Mon, 18 Nov 2019 14:20:41 +0100
Subject: [PATCH 10/35] Remove add on sensor layouts

---
 views/dataset/_form_on_sensor.php  | 428 -----------------------------
 views/dataset/create_on_sensor.php |  35 ---
 views/layouts/main.php             |   4 -
 3 files changed, 467 deletions(-)
 delete mode 100644 views/dataset/_form_on_sensor.php
 delete mode 100755 views/dataset/create_on_sensor.php

diff --git a/views/dataset/_form_on_sensor.php b/views/dataset/_form_on_sensor.php
deleted file mode 100644
index 831e76fb..00000000
--- a/views/dataset/_form_on_sensor.php
+++ /dev/null
@@ -1,428 +0,0 @@
-<?php
-
-//**********************************************************************************************
-//                                       _form.php
-//
-// Author(s): Morgane VIDAL
-// PHIS-SILEX version 1.0
-// Copyright © - INRA - 2017
-// Creation date: October 2017
-// Contact: morgane.vidal@inra.fr, anne.tireau@inra.fr, pascal.neveu@inra.fr
-// Last modification date:  January, 15 2018 (multiple variables dataset)
-// Subject: creation of dataset via CSV
-//***********************************************************************************************
-
-use Yii;
-use yii\helpers\Html;
-use unclead\multipleinput\MultipleInput;
-use kartik\form\ActiveForm;
-use kartik\file\FileInput;
-use yii\helpers\Url;
-
-/* @var $this yii\web\View */
-/* @var $model app\models\YiiDatasetModel */
-/* @var $form yii\widgets\ActiveForm */
-/* @var $handsontable openSILEX\handsontablePHP\adapter\HandsontableSimple */
-/* @var $handsontableErrorsCellsSettings string */
-
- if ($handsontable !== null) {
-     echo $handsontable->loadJSLibraries(true);
-     echo $handsontable->loadCSSLibraries();
- }
-
-?>
-
-<div class="dataset-form well">
-    <?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]); ?>
-
-    <?= Yii::$app->session->getFlash('renderArray'); ?>
-
-    <?php
-        if (isset($errors) && $errors !== null):
-    ?>
-    <div class="alert alert-danger" >
-        <h3 style="margin:3%;">Errors found in dataset :</h3>
-        <ul>
-        <?php 
-            // Display error messages
-            $errorMessages = [];
-            foreach($errors as $error) {
-                if (is_string($error)) {
-                    $errorMessages[] =  $error;
-                } else {
-                    $errorMessages[] =  $error->exception->details;
-                }
-            }
-            
-            $errorMessages = array_unique($errorMessages);
-            foreach ($errorMessages as $errorMessage) {
-                 echo '<li>' . $errorMessage . '</li>';
-            }
-            
-        ?>
-        </ul>
-    </div>
-    <?php
-        endif;
-    ?>
-    <?php
-        if (isset($handsontable) && $handsontable !== null):
-    ?>
-        <div id="errors">
-
-            <h3 class="alert alert-danger" style="margin:3%;">Errors found in dataset </h3>
-
-                <div id="<?= $handsontable->getContainerName() ?>">
-                </div>
-                <script>
-                    <?= $handsontable->generateJavascriptCode(); ?>
-                    <?= $handsontableErrorsCellsSettings; ?>
-                </script>
-
-        </div>
-
-        <h3 class="alert alert-info" style="margin:3%;">Add dataset form</h3>
-    <?php endif; ?>
-    
-    <?= $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(),[
-                'data' => $this->params['variables'],
-                'options' => [
-                    'placeholder' => Yii::t('app/messages', 'Select one or many variables') . ' ...',
-                    'id' => 'uriVariable-selector',
-                    'multiple' => true
-                ],
-                'pluginOptions' => [
-                    'allowClear' => true,
-                    'tags' => true
-                ],
-            ]); ?>
-
-    <hr style="border-color : gray;"/>
-    <h3><?= Yii::t('app', 'Provenance')?></h3>
-
-    <script>
-        $(document).ready(function() {
-            <?php
-                // Create Provenance select values array
-                foreach ($this->params['provenances'] as $uri => $provenance) {
-                    $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
-                }
-                // Inject URI to get document widget linked to an URI
-                echo 'var documentsLoadUri = "' . Url::to(['document/get-documents-widget']) . '";';
-                // Inject provenances list indexed by URI
-                echo 'var provenances = ' . json_encode($this->params['provenances']) . ';';
-                 // Inject sensingDevices list indexed by URI
-                echo 'var sensingDevices = ' . json_encode($this->params['sensingDevices']) . ';';
-                 // Inject agents list indexed by URI
-                echo 'var agents = ' . json_encode($this->params['agents']) . ';';
-            ?>
-                
-            // Function to update provenance comment field depending of selected URI
-            var updateProvenanceFields = function(uri) {
-                if (provenances.hasOwnProperty(uri)) {
-//                    console.log(provenances[uri]);
-                    // If selected provenance is known get its comment
-                    var comment = provenances[uri]["comment"];
-                    
-                    // Set provenance comment, disable input and remove validation messages 
-                    $("#yiidatasetmodel-provenancecomment").val(comment).attr("disabled", "disabled");
-                    $(".field-yiidatasetmodel-provenancecomment, .field-yiidatasetmodel-provenancecomment *")
-                        .removeClass("has-error")
-                        .removeClass("has-success");
-                    $(".field-yiidatasetmodel-provenancecomment .help-block").empty();
-                    
-                    // Set provenance provenanceSensingDevices, disable input and remove validation messages 
-                    try {
-                        var provenanceSensingDevices = provenances[uri]["metadata"]["prov:Agent"]["oeso:SensingDevice"];
-                        $("#yiidatasetmodel-provenancesensingdevices").val(provenanceSensingDevices);
-                        $("#yiidatasetmodel-provenancesensingdevices").trigger("change");
-//                        console.log(provenanceSensingDevices);
-                    }
-                    catch(error) {
-                        $("#yiidatasetmodel-provenancesensingdevices").val([]);
-                        $("#yiidatasetmodel-provenancesensingdevices").trigger("change");
-                        console.log("No sensing device set");
-                    }finally {
-                        $("#yiidatasetmodel-provenancesensingdevices").val(provenanceSensingDevices).attr("disabled", "disabled");
-                        $(".field-yiidatasetmodel-provenancesensingdevices, .field-yiidatasetmodel-provenancesensingdevices *")
-                            .removeClass("has-error")
-                            .removeClass("has-success");
-                        $(".field-yiidatasetmodel-provenancesensingdevices .help-block").empty();
-                    }
-                    // Set provenance provenanceSensingDevices, disable input and remove validation messages 
-                    try {
-                        var provenanceAgents = provenances[uri]["metadata"]["prov:Agent"]["oeso:Operator"];
-                        $("#yiidatasetmodel-provenanceagents").val(provenanceAgents);
-                        $("#yiidatasetmodel-provenanceagents").trigger("change");
-//                        console.log(provenanceAgents);
-                    }
-                    catch(error) {
-                         $("#yiidatasetmodel-provenanceagents").val([]);
-                         $("#yiidatasetmodel-provenanceagents").trigger("change");
-                         console.log("No agents set");
-                    }finally {
-                        $("#yiidatasetmodel-provenanceagents").val(agents).attr("disabled", "disabled");
-                        $(".field-yiidatasetmodel-provenanceagents, .field-yiidatasetmodel-provenanceagents *")
-                            .removeClass("has-error")
-                            .removeClass("has-success");
-                        $(".field-yiidatasetmodel-provenanceagents .help-block").empty();
-                    }
-                    // Load linked documents
-                    $("#already-linked-documents").load(documentsLoadUri, {
-                        "uri": uri
-                    })
-                } else {
-                    // Otherwise clear provenance comment and enable input
-                    $("#yiidatasetmodel-provenancesensingdevices").val(sensingDevices).removeAttr("disabled").trigger("change");
-                    
-                    // Otherwise clear provenance comment and enable input
-                    $("#yiidatasetmodel-provenanceagents").val(agents).removeAttr("disabled").trigger("change");
-                    
-                    // Otherwise clear provenance comment and enable input
-                    $("#yiidatasetmodel-provenancecomment").val("").removeAttr("disabled");
-                    
-                    // Clear linked documents list
-                    $("#already-linked-documents").empty();
-                }    
-            }
-            
-            // On provenance change update provenance fields
-            $("#provenance-selector").change(function() {
-                updateProvenanceFields($(this).val());
-            });
-            
-            // Update provenance fields depending of startup value
-            updateProvenanceFields($("#provenance-selector").val());
-        });
-    </script>
-    <?= $form->field($model, 'provenanceUri')->widget(\kartik\select2\Select2::classname(),[
-                'data' => $provenancesArray,
-                'options' => [
-                    'placeholder' => Yii::t('app/messages', 'Select existing provenance or create a new one') . ' ...',
-                    'id' => 'provenance-selector',
-                    'multiple' => false
-                ],
-                'pluginOptions' => [
-                    'allowClear' => true,
-                    'tags' => true
-                ],
-            ]); ?>
-
-      <?= $form->field($model, 'provenanceSensingDevices')->widget(\kartik\select2\Select2::classname(),[
-                'data' => $this->params['sensingDevices'],
-                'options' => [
-                    'placeholder' => Yii::t('app/messages', 'Select existing device') . ' ...',
-                    'multiple' => true
-                ],
-                'pluginOptions' => [
-                    'allowClear' => false,
-                    'tags' => true
-                ],
-            ]); ?>
-    
-    <?= $form->field($model, 'provenanceAgents')->widget(\kartik\select2\Select2::classname(),[
-                'data' => $this->params['agents'],
-                'options' => [
-                    'placeholder' => 'Select operator ...',
-                    'multiple' => true
-                ],
-                'pluginOptions' => [
-                    'allowClear' => true
-                ],
-            ]); ?>
-
-    <?= $form->field($model, 'provenanceComment')->textarea(['rows' => 6]) ?>
-    
-    <h3><?= Yii::t('app', 'Linked Document(s)') ?></h3>
-    <div id="already-linked-documents"></div>
-   <?=  $form->field($model, 'documentsURIs')->widget(MultipleInput::className(), [
-        'max'               => 6,
-        'allowEmptyList'    => true,
-        'enableGuessTitle'  => true,
-        'columns' => [
-            [
-                'name' => 'documentURI',
-                'options' => [
-                  'readonly' => true,
-                  'style' => 'background-color:#C4DAE7;',
-                 ]
-            ]
-        ],
-        'addButtonOptions' => [
-            'class' => 'btn btn-primary buttonDocuments',
-            'label' => Yii::t('app', 'Add Document')
-        ],
-    ])->label(false)
-    ?>
-
-
-
-    <hr style="border-color : gray;"/>
-
-      <div class="alert alert-info" role="alert">
-        <b><?= Yii::t('app/messages', 'File Rules')?> : </b>
-        <ul>
-            <li><?= Yii::t('app/messages', 'CSV separator must be')?> "<b><?= Yii::$app->params['csvSeparator']?></b>"</li>
-            <li><?= Yii::t('app/messages', 'Decimal separator for numeric values must be')?> "<b>.</b>"</li>
-        </ul>
-        <br/>
-        <b><?= Yii::t('app', 'Columns')?> : </b>
-        <table class="table table-hover" id="dataset-csv-columns-desc">
-            <tr>
-                <th style="color:red">Date *</th>
-                <td><p><?= Yii::t('app/messages', 'Acquisition date of the data') ?> (format ISO 8601: YYYY-MM-DD or YYYY-MM-DDTHH:mm:ssZ) </p> </td>
-            </tr>
-             <tr class="dataset-variables">
-                <th style="color:red">Value *</th>
-                <td ><?= Yii::t('app', 'Value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)</td>
-            </tr>
-        </table>
-    </div>
-
-    <p>
-        <?php 
-            $csvPath = "coma";
-            if (Yii::$app->params['csvSeparator'] == ";") {
-                $csvPath = "semicolon";
-            }
-        ?>
-        <i><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Template'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetSensorTemplate.csv', ['id' => 'datasetSensorTemplate']) ?></i>
-        <i style="float: right"><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Example'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetSensorExemple.csv') ?></i>
-    </p>
-    <?= $form->field($model, 'file')->widget(FileInput::classname(), [
-        'options' => [
-            'maxFileSize' => 2000,
-            'pluginOptions'=>['allowedFileExtensions'=>['csv'],'showUpload' => false],
-        ]
-    ]);
-    ?>
-
-    <div class="form-group">
-        <?= Html::submitButton(Yii::t('yii' , 'Create') , ['class' => 'btn btn-success']) ?>
-    </div>
-
-    <?php ActiveForm::end(); ?>
-
-    <div class="modal fade" id="document-modal" tabindex="-1" role="dialog" aria-labelledby="document-modal-title">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    <h4 class="modal-title" id="document-modal-title"><?php echo Html::encode(Yii::t('app', 'Create Document')); ?></h4>
-                </div>
-                <div class="modal-body">
-                    <div id="document-content"></div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-success" id="document-save"><?php echo Html::encode(Yii::t('yii', 'Create')) ?></button>
-                     <button type="button" class="btn btn-default modal-close" data-dismiss="modal"><?php echo Html::encode(Yii::t('yii', 'Close')) ?></button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script>
-    $(document).ready(function(){
-        // Load document add form popin
-        $('#document-content').load('<?php echo Url::to(['document/create-from-dataset']) ?>');
-        
-        var documentUploaded = false;
-        // Clear last uploaded document line if document add form is canceled
-        $('#document-modal').on('hidden.bs.modal', function () {
-            if (!documentUploaded) {
-                $(".js-input-remove:last").click();
-            }
-            documentUploaded = false;
-            
-            $('#document-content form').trigger('reset');
-
-            $('#document-save-msg').parent().removeClass('alert-danger');
-            $('#document-save-msg').parent().addClass('alert-info');
-            $('#document-save-msg').html('<?php echo Yii::t('app/messages', 'Request text'); ?>');
-        });
-
-        $(document).on('change', '#uriVariable-selector', function() {
-            $(".dataset-variables").remove();
-              $("#uriVariable-selector :selected").each(function (i,sel) {
-                    $('#dataset-csv-columns-desc').append(
-                            '<tr class="dataset-variables">'
-                                + '<th style="color:red" >'
-                                    + $(sel).text() + ' *'
-                                + '</th>'
-                                + '<td>'
-                                    + '<?php echo Yii::t("app/messages", "Value"); ?> (<?php echo Yii::t('app', 'Real number, String or Date'); ?>)'
-                                + '</td>'
-                            + '</tr>');
-                  });
-        });
-
-        // Initial document count
-        var nbDocuments = -1;
-        $(document).on('click', '#document-save', function () {
-                // On save get document form values
-                var formData = new FormData();
-                var file_data = $('#document-content #yiidocumentmodel-file').prop('files')[0];
-                formData.append('file', file_data);
-                var other_data = $('form').serializeArray();
-                $.each(other_data, function(key, input) {
-                    formData.append(input.name, input.value);
-                });
-
-                // Send documents form
-                $.ajax({
-                    url: 'index.php?r=document%2Fcreate-from-dataset',
-                    type: 'POST',
-                    processData: false,
-                    datatype: 'json',
-                    contentType: false,
-                    data: formData
-
-                })
-                .done(function (data) {
-                    // Add document URI and close document add form
-                    $('#yiidatasetmodel-documentsuris-documenturi-' + nbDocuments).val(data);
-                    documentUploaded = true;
-                    $('#document-modal').modal('toggle');
-
-                })
-                .fail(function (jqXHR, textStatus) {
-                    // Disaply errors
-                    $('#document-save-msg').parent().removeClass('alert-info');
-                    $('#document-save-msg').parent().addClass('alert-danger');
-                    $('#document-save-msg').html('Request failed: ' + textStatus);
-                });
-                
-                return false;
-        });
-
-        // Open document add form on click
-        $('.buttonDocuments').click(function() {
-            nbDocuments++;
-            typeInsertedDocument = "document";
-            $('#document-modal').modal('toggle');
-        });
-
-        // Download adjusted to variables CSV template file on click
-        $(document).on('change', '#uriVariable-selector', function () {
-            var variablesLabels = [];
-            $("#uriVariable-selector :selected").each(function (i,sel) {
-                variablesLabels.push($(sel).text());
-              });
-            $.ajax({
-                url: 'index.php?r=dataset%2Fgenerate-and-download-dataset-sensor-creation-file',
-                type: 'POST',
-                datatype: 'json',
-                data: {variables: variablesLabels}
-            })
-                    .done(function (data) {
-                    })
-                    .fail(function (jqXHR, textStatus) {
-                        $('#document-save-msg').parent().removeClass('alert-info');
-                        $('#document-save-msg').parent().addClass('alert-danger');
-                        $('#document-save-msg').html('Request failed: ' + textStatus);
-                    });
-        });
-
-    });
-    </script>
-</div>
diff --git a/views/dataset/create_on_sensor.php b/views/dataset/create_on_sensor.php
deleted file mode 100755
index f68c659c..00000000
--- a/views/dataset/create_on_sensor.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-//**********************************************************************************************
-//                                       create.php 
-//
-// Author(s): Morgane VIDAL
-// PHIS-SILEX version 1.0
-// Copyright © - INRA - 2017
-// Creation date: October 2017
-// Contact: morgane.vidal@inra.fr, anne.tireau@inra.fr, pascal.neveu@inra.fr
-// Last modification date:  October, 4 2017
-// Subject: creatin dataset by CSV
-//***********************************************************************************************
-
-use yii\helpers\Html;
-
-/* @var $this yii\web\View */
-/* @var $model app\models\YiiDatasetModel */
-/* @var $handsontable openSILEX\handsontablePHP\adapter\HandsontableSimple */
-/* @var $handsontableErrorsCellsSettings string */
-
-$this->title = Yii::t('app', 'Add Data on sensor');
-//$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Dataset', ['n' => 2]), 'url' => ['index']];
-$this->params['breadcrumbs'][] = $this->title;
-?>
-<div class="dataset-create_on_sensor">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-    <?= $this->render('_form_on_sensor', [
-        'model' => $model,
-        'errors' => $errors,
-        'handsontable' => isset($handsontable) ? $handsontable : null,
-        'handsontableErrorsCellsSettings' =>  isset($handsontableErrorsCellsSettings) ? $handsontableErrorsCellsSettings : null
-    ]) ?>
-</div>
diff --git a/views/layouts/main.php b/views/layouts/main.php
index 63c8b882..fb14e23f 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -110,10 +110,6 @@
                                     'label' => Icon::show('plus', ['class' => 'fa-large'], Icon::FA) . " " . Yii::t('app', 'Add on scientific object'),
                                     'url' => ['/dataset/create']
                                 ],
-                                [
-                                    'label' => Icon::show('plus', ['class' => 'fa-large'], Icon::FA) . " " . Yii::t('app', 'Add only on sensor'),
-                                    'url' => ['/dataset/create-on-sensor']
-                                ],
                                 [
                                     'label' => Icon::show('search', ['class' => 'fa-large'], Icon::FA) . " " . Yii::t('app', 'View'),
                                     'url' => ['/data/index']

From 77cdfbb3e6c2fc3016a8175fd9559fd16a60a7f0 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Mon, 18 Nov 2019 14:50:17 +0100
Subject: [PATCH 11/35] Fix write access

---
 web/documents/DatasetFiles/coma/datasetSensorExemple.csv       | 0
 web/documents/DatasetFiles/coma/datasetSensorTemplate.csv      | 0
 web/documents/DatasetFiles/coma/datasetTemplate.csv            | 0
 web/documents/DatasetFiles/semicolon/datasetExemple.csv        | 0
 web/documents/DatasetFiles/semicolon/datasetSensorExemple.csv  | 0
 web/documents/DatasetFiles/semicolon/datasetSensorTemplate.csv | 0
 web/documents/DatasetFiles/semicolon/datasetTemplate.csv       | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 web/documents/DatasetFiles/coma/datasetSensorExemple.csv
 mode change 100644 => 100755 web/documents/DatasetFiles/coma/datasetSensorTemplate.csv
 mode change 100644 => 100755 web/documents/DatasetFiles/coma/datasetTemplate.csv
 mode change 100644 => 100755 web/documents/DatasetFiles/semicolon/datasetExemple.csv
 mode change 100644 => 100755 web/documents/DatasetFiles/semicolon/datasetSensorExemple.csv
 mode change 100644 => 100755 web/documents/DatasetFiles/semicolon/datasetSensorTemplate.csv
 mode change 100644 => 100755 web/documents/DatasetFiles/semicolon/datasetTemplate.csv

diff --git a/web/documents/DatasetFiles/coma/datasetSensorExemple.csv b/web/documents/DatasetFiles/coma/datasetSensorExemple.csv
old mode 100644
new mode 100755
diff --git a/web/documents/DatasetFiles/coma/datasetSensorTemplate.csv b/web/documents/DatasetFiles/coma/datasetSensorTemplate.csv
old mode 100644
new mode 100755
diff --git a/web/documents/DatasetFiles/coma/datasetTemplate.csv b/web/documents/DatasetFiles/coma/datasetTemplate.csv
old mode 100644
new mode 100755
diff --git a/web/documents/DatasetFiles/semicolon/datasetExemple.csv b/web/documents/DatasetFiles/semicolon/datasetExemple.csv
old mode 100644
new mode 100755
diff --git a/web/documents/DatasetFiles/semicolon/datasetSensorExemple.csv b/web/documents/DatasetFiles/semicolon/datasetSensorExemple.csv
old mode 100644
new mode 100755
diff --git a/web/documents/DatasetFiles/semicolon/datasetSensorTemplate.csv b/web/documents/DatasetFiles/semicolon/datasetSensorTemplate.csv
old mode 100644
new mode 100755
diff --git a/web/documents/DatasetFiles/semicolon/datasetTemplate.csv b/web/documents/DatasetFiles/semicolon/datasetTemplate.csv
old mode 100644
new mode 100755

From ad9f3fcb1a8fa169dc7de3511624072db43f9c3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9as?= <andreas.garcia@lilo.org>
Date: Mon, 18 Nov 2019 15:02:55 +0100
Subject: [PATCH 12/35] Improve English translation

---
 translations/fr/messages.php | 2 +-
 views/dataset/_form.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/translations/fr/messages.php b/translations/fr/messages.php
index c44a0538..f73110c6 100755
--- a/translations/fr/messages.php
+++ b/translations/fr/messages.php
@@ -98,7 +98,7 @@
     'Select image view...' => 'Sélectionnez la vue de l\'image...',
     'Select provenance...'=>'Sélectionnez la provenance...',
     'Select type...' => 'Sélectionnez le type...',
-    'Select one or many variables' => 'Sélectionnez une ou plusieurs variables',
+    'Select one or more variables' => 'Sélectionnez une ou plusieurs variables',
     'Select existing provenance or create a new one' => 'Selectionnez une provenance existante où créez en une nouvelle',
     'Software is licensed under AGPL-3.0 and data under CC BY-NC-SA 4.0' => 'Le logiciel est sous licence AGPL-3.0 et les données sous CC BY-NC-SA 4.0',
     'Some required fields are missings' => 'Des champs requis sont manquants.',
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index 6638b397..a6154f7e 100755
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -99,7 +99,7 @@
     <?= $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(),[
                 'data' => $this->params['variables'],
                 'options' => [
-                    'placeholder' => Yii::t('app/messages', 'Select one or many variables') . ' ...',
+                    'placeholder' => Yii::t('app/messages', 'Select one or more variables') . ' ...',
                     'id' => 'uriVariable-selector',
                     'multiple' => true
                 ],

From 8ea68364fd42cfa89de67ac6be311e575816dfdf Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Wed, 20 Nov 2019 16:34:04 +0100
Subject: [PATCH 13/35] Update dataset controller and view

---
 controllers/DatasetController.php       | 234 ++--------
 models/yiiModels/YiiDataSensorModel.php |  37 --
 models/yiiModels/YiiDatasetModel.php    |   5 +-
 views/dataset/_form.php                 | 546 +++++++++++++-----------
 4 files changed, 339 insertions(+), 483 deletions(-)
 delete mode 100644 models/yiiModels/YiiDataSensorModel.php

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index bb592c73..ed6cb35f 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -166,7 +166,39 @@ public function actionGenerateAndDownloadDatasetSensorCreationFile() {
         fputcsv($file, $fileColumns, $delimiter = Yii::$app->params['csvSeparator']);
         fclose($file);
     }
-
+    
+    /**
+     * 
+     * @param type $experimentUri
+     */
+    public function actionGetExperimentMesuredVariablesSelectList($experimentUri){
+        
+        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $variables = [];
+        $variables["data"] = [];
+        $experimentVariable = $this->getExperimentMesuredVariablesSelectList($experimentUri);
+        foreach ($experimentVariable as $key => $value) {
+            $variables["data"][] = ["id" => $key, "text" => $value];
+        }
+       
+        return($variables);
+    }
+    
+    private function getExperimentMesuredVariablesSelectList($experimentUri) {
+        if(!isset($experimentUri) || empty($experimentUri)){
+            return [];
+        }
+        $experimentModel = new YiiExperimentModel();
+        $variables = $experimentModel->getMeasuredVariables(
+                Yii::$app->session[WSConstants::ACCESS_TOKEN],
+                $experimentUri
+                );
+        if(isset($variables) && is_array($variables)){
+            return $variables;
+        }
+        return [];
+    }
+    
     /**
      * 
      * @param array $csvErrors the errors founded. 
@@ -344,18 +376,10 @@ public function actionCreate() {
 
         $token = Yii::$app->session[WSConstants::ACCESS_TOKEN];
 
-        // Load existing variables
-        $variables = $variablesModel->getInstancesDefinitionsUrisAndLabel($token);
-        $this->view->params["variables"] = $this->getVariablesListLabelToShowFromVariableList($variables);
-
         // Load existing provenances
         $provenanceService = new WSProvenanceModel();
         $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
         $this->view->params["provenances"] = $provenances;
-        
-        // Load existing sensors
-        $sensors = $this->getSensorsUrisTypesLabels($token);
-        $this->view->params["sensingDevices"] = $this->getSensorListToShowFromSensorList($sensors);
 
          // Load existing agents
         $userModel = new \app\models\yiiModels\YiiUserModel();
@@ -380,10 +404,12 @@ public function actionCreate() {
             unlink($serverFilePath);
 
             //Loaded given variables
-            $givenVariables = $datasetModel->variables;
-
+            $experimentVariables = $this->getExperimentMesuredVariablesSelectList($datasetModel->experiment) ;
+            $csvVariables = array_slice($csvHeaders, 2);
+            // select all variables that don"t exist in experiment variables
+            $variablesNotInExperiment = array_diff($csvVariables, $experimentVariables);
             // Check CSV header with variables
-            if (array_slice($csvHeaders, 2) === $givenVariables) {
+            if (count($variablesNotInExperiment) === 0) {
                 // Get selected or create Provenance URI
                 if (!array_key_exists($datasetModel->provenanceUri, $provenances)) {
                     $provenanceUri = $this->createProvenance(
@@ -494,7 +520,7 @@ public function actionCreate() {
                 return $this->render('create', [
                             'model' => $datasetModel,
                             'errors' => [
-                                Yii::t("app/messages", "CSV file headers does not match selected variables")
+                                Yii::t("app/messages", "CSV file headers does not match selected variables (" . implode(",", $variablesNotInExperiment) . ")")
                             ]
                 ]);
             }
@@ -505,144 +531,6 @@ public function actionCreate() {
         }
     }
     
-    /**
-     * register the sensor data with the associated provenance and documents
-     * @return mixed
-     */
-    public function actionCreateOnSensor() {
-        $datasetModel = new \app\models\yiiModels\YiiDataSensorModel();
-        $variablesModel = new \app\models\yiiModels\YiiVariableModel();
-
-        $token = Yii::$app->session[WSConstants::ACCESS_TOKEN];
-
-        // Load existing variables
-        $variables = $variablesModel->getInstancesDefinitionsUrisAndLabel($token);
-        $this->view->params["variables"] = $this->getVariablesListLabelToShowFromVariableList($variables);
-
-        // Load existing provenances
-        $provenanceService = new WSProvenanceModel();
-        $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
-        $this->view->params["provenances"] = $provenances;
-        
-        // Load existing sensors
-        $sensors = $this->getSensorsUrisTypesLabels($token);
-        $this->view->params["sensingDevices"] = $this->getSensorListToShowFromSensorList($sensors);
-
-         // Load existing agents
-        $userModel = new \app\models\yiiModels\YiiUserModel();
-        $users = $userModel->getPersonsMailsAndName($token);
-        $this->view->params['agents'] = $users;
-        //If the form is complete, register data
-        if ($datasetModel->load(Yii::$app->request->post())) {
-            //Store uploaded CSV file
-            $document = UploadedFile::getInstance($datasetModel, 'file');
-            $serverFilePath = \config::path()['documentsUrl'] . "DatasetFiles/" . $document->name;
-            $document->saveAs($serverFilePath);
-
-            //Read CSV file content
-            $fileContent = str_getcsv(file_get_contents($serverFilePath), "\n");
-            $csvHeaders = str_getcsv(array_shift($fileContent), Yii::$app->params['csvSeparator']);
-            unlink($serverFilePath);
-
-            //Loaded given variables
-            $givenVariables = $datasetModel->variables;
-
-            // Check CSV header with variables
-            if (array_slice($csvHeaders, 1) === $givenVariables) {
-                // Get selected or create Provenance URI
-                if (!array_key_exists($datasetModel->provenanceUri, $provenances)) {
-                    $provenanceUri = $this->createProvenance(
-                            $datasetModel->provenanceUri,
-                            $datasetModel->provenanceComment,
-                            $datasetModel->provenanceSensingDevices,
-                            $datasetModel->provenanceAgents
-                    );
-                    $datasetModel->provenanceUri = $provenanceUri;
-                    $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
-                    $this->view->params["provenances"] = $provenances;
-                } else {
-                    $provenanceUri = $datasetModel->provenanceUri;
-                }
-
-                // If provenance sucessfully created
-                if ($provenanceUri) {
-                    // Link uploaded documents to provenance URI
-                    $linkDocuments = true;
-                    if (is_array($datasetModel->documentsURIs) && is_array($datasetModel->documentsURIs["documentURI"])) {
-                        $linkDocuments = $this->linkDocumentsToProvenance(
-                                $provenanceUri,
-                                $datasetModel->documentsURIs["documentURI"]
-                        );
-                    }
-
-                    $datasetModel->documentsURIs = null;
-                      
-                    if ($linkDocuments === true) {
-                        // Save CSV data linked to provenance URI
-                        $values = [];
-                        $scientifObjectUri = null;
-                        foreach ($fileContent as $rowStr) {
-                            $row = str_getcsv($rowStr, Yii::$app->params['csvSeparator']);
-                            $date = $row[0];
-                            for ($i = 1; $i < count($row); $i++) {
-                                $values[] = [
-                                    "provenanceUri" => $provenanceUri,
-                                    "objectUri" => $scientifObjectUri,
-                                    "variableUri" => array_search($givenVariables[$i - 1], $variables),
-                                    "date" => $date,
-                                    "value" => $row[$i]
-                                ];
-                            }
-                        }
-                        
-                        $dataService = new WSDataModel();
-                        $result = $dataService->post($token, "/", $values);
-//                        var_dump($result);exit;
-                        // If data successfully saved
-                        if (is_array($result->metadata->datafiles) && count($result->metadata->datafiles) > 0) {
-                            $arrayData = $this->csvToArray($fileContent);
-                            return $this->render('_form_dataset_created', [
-                                        'model' => $datasetModel,
-                                        'handsontable' => $this->generateHandsontableDataset($csvHeaders, $arrayData),
-                                        'insertedDataNumber' => count($arrayData)
-                            ]);
-                        } else {
-
-                            return $this->render('create_on_sensor', [
-                                        'model' => $datasetModel,
-                                        'errors' => $result->metadata->status
-                            ]);
-                        }
-                    } else {
-                        return $this->render('create_on_sensor', [
-                                    'model' => $datasetModel,
-                                    'errors' => [
-                                        Yii::t("app/messages", "Error while creating linked documents")
-                                    ]
-                        ]);
-                    }
-                } else {
-                    return $this->render('create_on_sensor', [
-                                'model' => $datasetModel,
-                                'errors' => [
-                                    Yii::t("app/messages", "Error while creating provenance")
-                                ]
-                    ]);
-                }
-            } else {
-                return $this->render('create_on_sensor', [
-                            'model' => $datasetModel,
-                            'errors' => [
-                                Yii::t("app/messages", "CSV file headers does not match selected variables")
-                            ]
-                ]);
-            }
-        } else {
-            return $this->render('create_on_sensor', [
-                        'model' => $datasetModel,
-            ]);
-        }
-    }
 
     /**
      * Create provenance from an alias and a comment
@@ -720,48 +608,4 @@ private function linkDocumentsToProvenance($provenanceUri, $documents) {
         }
     }
     
-    /**
-     * Gets all sensors.
-     * @return sensors 
-     */
-    public function getSensorsUrisTypesLabels() {
-        $model = new \app\models\yiiModels\SensorSearch();
-        $model->page = 0;
-        $model->pageSize = 10000;
-        $sensorsUrisTypesLabels = [];
-        $sensors = $model->search(Yii::$app->session[WSConstants::ACCESS_TOKEN], null);
-        if ($sensors === WSConstants::TOKEN_INVALID) {
-            return WSConstants::TOKEN_INVALID;
-        } else {
-            foreach ($sensors->models as $sensor) {
-                $sensorsUrisTypesLabels[] =
-                    [
-                        self::SENSOR_DATA_URI => $sensor->uri,
-                        self::SENSOR_DATA_LABEL => $sensor->label,
-                        self::SENSOR_DATA_TYPE => $sensor->rdfType
-                    ];
-            }
-        }
-        return $sensorsUrisTypesLabels;
-    }
-    
-    /**
-     * 
-     * @param type $sensorsUriTypesLabel
-     * @return array
-     */
-    public function getSensorListToShowFromSensorList($sensorsUriTypesLabel) {
-        $sensorLabelListToShow = [];
-        foreach ($sensorsUriTypesLabel as $sensorUriTypesLabel) {
-            $sensorType = Vocabulary::prettyUri($sensorUriTypesLabel[self::SENSOR_DATA_TYPE]);
-            if (isset($sensorLabelListToShow[$sensorType])) {
-                $sensorLabelListToShow[$sensorType][$sensorUriTypesLabel[self::SENSOR_DATA_URI]] = $sensorUriTypesLabel[self::SENSOR_DATA_LABEL];
-            } else {
-                $sensorLabelListToShow[$sensorType] = [
-                $sensorUriTypesLabel[self::SENSOR_DATA_URI] => $sensorUriTypesLabel[self::SENSOR_DATA_LABEL]
-                ];
-            }
-        }
-        return $sensorLabelListToShow;
-    }
 }
diff --git a/models/yiiModels/YiiDataSensorModel.php b/models/yiiModels/YiiDataSensorModel.php
deleted file mode 100644
index 486c4f18..00000000
--- a/models/yiiModels/YiiDataSensorModel.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-//**********************************************************************************************
-//                                       YiiDatasetModel.php 
-//
-// Author(s): Morgane VIDAL
-// PHIS-SILEX version 1.0
-// Copyright © - INRA - 2017
-// Creation date: October 2017
-// Contact: morgane.vidal@inra.fr, anne.tireau@inra.fr, pascal.neveu@inra.fr
-// Last modification date:  October, 2 2017
-// Subject: The Yii model for the dataset. Used with web services
-//***********************************************************************************************
-
-namespace app\models\yiiModels;
-
-use Yii;
-use app\models\yiiModels\YiiDatasetModel;
-use app\models\wsModels\WSDatasetModel;
-
-/**
- * Model for the dataset. Used with web services
- * @author Morgane Vidal <morgane.vidal@inra.fr>
- */
-class YiiDataSensorModel extends YiiDatasetModel {
-
-  /**
-     * 
-     * @return array the rules of the attributes
-     */
-    public function rules() {
-        $rules =  parent::rules();
-        $rules[] =[['provenanceSensingDevices'], 'required'];
-        return $rules;
-    }
-
-}
diff --git a/models/yiiModels/YiiDatasetModel.php b/models/yiiModels/YiiDatasetModel.php
index 23f02d62..e4121ca2 100755
--- a/models/yiiModels/YiiDatasetModel.php
+++ b/models/yiiModels/YiiDatasetModel.php
@@ -112,9 +112,8 @@ public function __construct($pageSize = null, $page = null) {
      */
     public function rules() {
         return [
-            [['variables', 'provenanceAlias', 'file', 'provenanceUri','experiment'], 'required'],
-            [['provenanceSensingDevices'], 'safe'],
-            [['provenanceAgents'], 'safe'],
+            [['provenanceAlias', 'file', 'provenanceUri','experiment'], 'required'],
+            [['variables','provenanceSensingDevices','provenanceAgents'], 'safe'],
             [['provenanceComment'], 'string'],
             [['experiment'], 'string'],
             [['provenanceUri', 'provenanceComment', 'documentsURIs', 'data', 'file'], 'safe'],
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index 6638b397..20c71692 100755
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -25,11 +25,10 @@
 /* @var $handsontable openSILEX\handsontablePHP\adapter\HandsontableSimple */
 /* @var $handsontableErrorsCellsSettings string */
 
- if ($handsontable !== null) {
-     echo $handsontable->loadJSLibraries(true);
-     echo $handsontable->loadCSSLibraries();
- }
-
+if ($handsontable !== null) {
+    echo $handsontable->loadJSLibraries(true);
+    echo $handsontable->loadCSSLibraries();
+}
 ?>
 
 <div class="dataset-form well">
@@ -38,127 +37,121 @@
     <?= Yii::$app->session->getFlash('renderArray'); ?>
 
     <?php
-        if (isset($errors) && $errors !== null):
-    ?>
-    <div class="alert alert-danger" >
-        <h3 style="margin:3%;">Errors found in dataset :</h3>
-        <ul>
-        <?php 
-            // Display error messages
-            $errorMessages = [];
-            foreach($errors as $error) {
-                if (is_string($error)) {
-                    $errorMessages[] =  $error;
-                } else {
-                    $errorMessages[] =  $error->exception->details;
-                }
-            }
-            
-            $errorMessages = array_unique($errorMessages);
-            foreach ($errorMessages as $errorMessage) {
-                 echo '<li>' . $errorMessage . '</li>';
-            }
-            
+    if (isset($errors) && $errors !== null):
         ?>
-        </ul>
-    </div>
+        <div class="alert alert-danger" >
+            <h3 style="margin:3%;">Errors found in dataset :</h3>
+            <ul>
+                <?php
+                // Display error messages
+                $errorMessages = [];
+                foreach ($errors as $error) {
+                    if (is_string($error)) {
+                        $errorMessages[] = $error;
+                    } else {
+                        $errorMessages[] = $error->exception->details;
+                    }
+                }
+
+                $errorMessages = array_unique($errorMessages);
+                foreach ($errorMessages as $errorMessage) {
+                    echo '<li>' . $errorMessage . '</li>';
+                }
+                ?>
+            </ul>
+        </div>
     <?php
-        endif;
-    ?>
+endif;
+?>
     <?php
-        if (isset($handsontable) && $handsontable !== null):
-    ?>
+    if (isset($handsontable) && $handsontable !== null):
+        ?>
         <div id="errors">
 
             <h3 class="alert alert-danger" style="margin:3%;">Errors found in dataset </h3>
 
-                <div id="<?= $handsontable->getContainerName() ?>">
-                </div>
-                <script>
-                    <?= $handsontable->generateJavascriptCode(); ?>
-                    <?= $handsontableErrorsCellsSettings; ?>
-                </script>
+            <div id="<?= $handsontable->getContainerName() ?>">
+            </div>
+            <script>
+    <?= $handsontable->generateJavascriptCode(); ?>
+    <?= $handsontableErrorsCellsSettings; ?>
+            </script>
 
         </div>
 
         <h3 class="alert alert-info" style="margin:3%;">Add dataset form</h3>
-    <?php endif; ?>
-    <?= $form->field($model, 'experiment')->widget(\kartik\select2\Select2::classname(),[
-                'data' => $this->params['experiments'],
-                'options' => [
-                    'placeholder' => Yii::t('app/messages', 'Select one experiment') . ' ...',
-                    'id' => 'experiment-selector',
-                    'multiple' => false
-                ],
-                'pluginOptions' => [
-                    'allowClear' => true,
-                    'tags' => true
-                ],
-            ]); ?>
-        
-    <?= $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(),[
-                'data' => $this->params['variables'],
-                'options' => [
-                    'placeholder' => Yii::t('app/messages', 'Select one or many variables') . ' ...',
-                    'id' => 'uriVariable-selector',
-                    'multiple' => true
-                ],
-                'pluginOptions' => [
-                    'allowClear' => true,
-                    'tags' => true
-                ],
-            ]); ?>
+<?php endif; ?>
+    <h3><i>  <?= Yii::t('app', 'Required dataset informations') ?></i></h3>
+
+<?=
+$form->field($model, 'experiment')->widget(\kartik\select2\Select2::classname(), [
+    'data' => $this->params['experiments'],
+    'options' => [
+        'placeholder' => Yii::t('app/messages', 'Select one experiment') . ' ...',
+        'id' => 'experiment-selector',
+        'multiple' => false
+    ],
+    'pluginOptions' => [
+        'allowClear' => true,
+        'tags' => true
+    ],  
+    'pluginEvents' => [
+        'select2:select' => 'function(e) { populateVariableList(e.params.data.id); }',
+    ]
+]);
+?>
+
+
 
     <hr style="border-color : gray;"/>
-    <h3><?= Yii::t('app', 'Provenance')?></h3>
+    <h4><?= Yii::t('app', 'Provenance') ?></h4>
 
     <script>
-        $(document).ready(function() {
-            <?php
-                // Create Provenance select values array
-                foreach ($this->params['provenances'] as $uri => $provenance) {
-                    $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
-                }
-                // Inject URI to get document widget linked to an URI
-                echo 'var documentsLoadUri = "' . Url::to(['document/get-documents-widget']) . '";';
-                // Inject provenances list indexed by URI
-                echo 'var provenances = ' . json_encode($this->params['provenances']) . ';';
-                 // Inject sensingDevices list indexed by URI
-                echo 'var sensingDevices = ' . json_encode($this->params['sensingDevices']) . ';';
-                 // Inject agents list indexed by URI
-                echo 'var agents = ' . json_encode($this->params['agents']) . ';';
-            ?>
-                
+        $(document).ready(function () {
+<?php
+// Create Provenance select values array
+foreach ($this->params['provenances'] as $uri => $provenance) {
+    $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
+}
+// Inject URI to get document widget linked to an URI
+echo 'var documentsLoadUri = "' . Url::to(['document/get-documents-widget']) . '";';
+// Inject provenances list indexed by URI
+echo 'var provenances = ' . json_encode($this->params['provenances']) . ';';
+// Inject sensingDevices list indexed by URI
+echo 'var sensingDevices = ' . json_encode($this->params['sensingDevices']) . ';';
+// Inject agents list indexed by URI
+echo 'var agents = ' . json_encode($this->params['agents']) . ';';
+?>
+
             // Function to update provenance comment field depending of selected URI
-            var updateProvenanceFields = function(uri) {
+            var updateProvenanceFields = function (uri) {
                 if (provenances.hasOwnProperty(uri)) {
 //                    console.log(provenances[uri]);
                     // If selected provenance is known get its comment
                     var comment = provenances[uri]["comment"];
-                    
+
                     // Set provenance comment, disable input and remove validation messages 
                     $("#yiidatasetmodel-provenancecomment").val(comment).attr("disabled", "disabled");
                     $(".field-yiidatasetmodel-provenancecomment, .field-yiidatasetmodel-provenancecomment *")
-                        .removeClass("has-error")
-                        .removeClass("has-success");
+                            .removeClass("has-error")
+                            .removeClass("has-success");
                     $(".field-yiidatasetmodel-provenancecomment .help-block").empty();
-                    
+
                     // Set provenance provenanceAgents, disable input and remove validation messages 
                     try {
                         var provenanceAgents = provenances[uri]["metadata"]["prov:Agent"]["oeso:Operator"];
                         $("#yiidatasetmodel-provenanceagents").val(provenanceAgents);
                         $("#yiidatasetmodel-provenanceagents").trigger("change");
 //                        console.log(provenanceAgents);
-                    }
-                    catch(error) {
-                         $("#yiidatasetmodel-provenanceagents").val([]);
-                         $("#yiidatasetmodel-provenanceagents").trigger("change");
-                         console.log("No agents set");
-                    }finally {
+                    } catch (error) {
+                        $("#yiidatasetmodel-provenanceagents").val([]);
+                        $("#yiidatasetmodel-provenanceagents").trigger("change");
+                        console.log("No agents set");
+                    } finally {
                         $("#yiidatasetmodel-provenanceagents").val(agents).attr("disabled", "disabled");
                         $(".field-yiidatasetmodel-provenanceagents, .field-yiidatasetmodel-provenanceagents *")
-                            .removeClass("has-error")
-                            .removeClass("has-success");
+                                .removeClass("has-error")
+                                .removeClass("has-success");
                         $(".field-yiidatasetmodel-provenanceagents .help-block").empty();
                     }
                     // Load linked documents
@@ -168,63 +161,68 @@
                 } else {
                     // Otherwise clear provenance agents and enable input
                     $("#yiidatasetmodel-provenanceagents").val(agents).removeAttr("disabled").trigger("change");
-                    
+
                     // Otherwise clear provenance comment and enable input
                     $("#yiidatasetmodel-provenancecomment").val("").removeAttr("disabled");
-                    
+
                     // Clear linked documents list
                     $("#already-linked-documents").empty();
-                }    
+                }
             }
-            
+
             // On provenance change update provenance fields
-            $("#provenance-selector").change(function() {
+            $("#provenance-selector").change(function () {
                 updateProvenanceFields($(this).val());
             });
-            
+
             // Update provenance fields depending of startup value
             updateProvenanceFields($("#provenance-selector").val());
         });
     </script>
-    <?= $form->field($model, 'provenanceUri')->widget(\kartik\select2\Select2::classname(),[
-                'data' => $provenancesArray,
-                'options' => [
-                    'placeholder' => Yii::t('app/messages', 'Select existing provenance or create a new one') . ' ...',
-                    'id' => 'provenance-selector',
-                    'multiple' => false
-                ],
-                'pluginOptions' => [
-                    'allowClear' => true,
-                    'tags' => true
-                ],
-            ]); ?>
-    
-    <?= $form->field($model, 'provenanceAgents')->widget(\kartik\select2\Select2::classname(),[
-                'data' => $this->params['agents'],
-                'options' => [
-                    'placeholder' => 'Select operator ...',
-                    'multiple' => true
-                ],
-                'pluginOptions' => [
-                    'allowClear' => true
-                ],
-            ]); ?>
+    <?=
+    $form->field($model, 'provenanceUri')->widget(\kartik\select2\Select2::classname(), [
+        'data' => $provenancesArray,
+        'options' => [
+            'placeholder' => Yii::t('app/messages', 'Select existing provenance or create a new one') . ' ...',
+            'id' => 'provenance-selector',
+            'multiple' => false
+        ],
+        'pluginOptions' => [
+            'allowClear' => true,
+            'tags' => true
+        ],
+    ]);
+    ?>
+
+    <?=
+    $form->field($model, 'provenanceAgents')->widget(\kartik\select2\Select2::classname(), [
+        'data' => $this->params['agents'],
+        'options' => [
+            'placeholder' => 'Select operator ...',
+            'multiple' => true
+        ],
+        'pluginOptions' => [
+            'allowClear' => true
+        ],
+    ]);
+    ?>
 
     <?= $form->field($model, 'provenanceComment')->textarea(['rows' => 6]) ?>
-    
+
     <h3><?= Yii::t('app', 'Linked Document(s)') ?></h3>
     <div id="already-linked-documents"></div>
-   <?=  $form->field($model, 'documentsURIs')->widget(MultipleInput::className(), [
-        'max'               => 6,
-        'allowEmptyList'    => true,
-        'enableGuessTitle'  => true,
+    <?=
+    $form->field($model, 'documentsURIs')->widget(MultipleInput::className(), [
+        'max' => 6,
+        'allowEmptyList' => true,
+        'enableGuessTitle' => true,
         'columns' => [
             [
                 'name' => 'documentURI',
                 'options' => [
-                  'readonly' => true,
-                  'style' => 'background-color:#C4DAE7;',
-                 ]
+                    'readonly' => true,
+                    'style' => 'background-color:#C4DAE7;',
+                ]
             ]
         ],
         'addButtonOptions' => [
@@ -233,58 +231,84 @@
         ],
     ])->label(false)
     ?>
+ 
 
-
-
-    <hr style="border-color : gray;"/>
-
-      <div class="alert alert-info" role="alert">
-        <b><?= Yii::t('app/messages', 'File Rules')?> : </b>
-        <ul>
-            <li><?= Yii::t('app/messages', 'CSV separator must be')?> "<b><?= Yii::$app->params['csvSeparator']?></b>"</li>
-            <li><?= Yii::t('app/messages', 'Decimal separator for numeric values must be')?> "<b>.</b>"</li>
-        </ul>
-        <br/>
-        <b><?= Yii::t('app', 'Columns')?> : </b>
-        <table class="table table-hover" id="dataset-csv-columns-desc">
-            <tr>
-                <th style="color:red">ScientificObjectAlias *</th>
-                <td><?= Yii::t('app/messages', 'The ALIAS of the scientific object for the choosen experiment (e.g MTP_WW_2019_P050_SH1_2018_LF14)')?></td>
-            </tr>
-            <tr>
-                <th style="color:red">Date *</th>
-                <td><p><?= Yii::t('app/messages', 'Acquisition date of the data') ?> (format ISO 8601: YYYY-MM-DD or YYYY-MM-DDTHH:mm:ssZ) </p> </td>
-            </tr>
-             <tr class="dataset-variables">
-                <th style="color:red">Value *</th>
-                <td ><?= Yii::t('app', 'Value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)</td>
-            </tr>
-        </table>
-    </div>
-
+    <h3><i>  <?= Yii::t('app', 'Dataset template generation') ?></i></h3>
+    <?php
+    $select2VariablesOptions =  [
+            'placeholder' => Yii::t('app/messages', 'Select one or many variables') . ' ...',
+            'id' => 'uriVariable-selector',
+            'multiple' => true
+        ]; 
+    ?>
+    
+    
+    <?=
+    $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(), [
+        'data' => $this->params['variables'],
+        'options' => $select2VariablesOptions,
+        'pluginOptions' => [
+            'allowClear' => true,
+            'tags' => true
+        ],
+    ]);
+    ?>
     <p>
-        <?php 
-            $csvPath = "coma";
-            if (Yii::$app->params['csvSeparator'] == ";") {
-                $csvPath = "semicolon";
-            }
-        ?>
+<?php
+$csvPath = "coma";
+if (Yii::$app->params['csvSeparator'] == ";") {
+    $csvPath = "semicolon";
+}
+?>
         <i><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Template'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetTemplate.csv', ['id' => 'downloadDatasetTemplate']) ?></i>
-        <i style="float: right"><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Example'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetExemple.csv') ?></i>
     </p>
-    <?= $form->field($model, 'file')->widget(FileInput::classname(), [
-        'options' => [
-            'maxFileSize' => 2000,
-            'pluginOptions'=>['allowedFileExtensions'=>['csv'],'showUpload' => false],
-        ]
-    ]);
-    ?>
+    
+    <hr style="border-color:gray;"/>
+    <hr style="border-color:gray;"/>
+    <i style="float: right"><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Example'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetExemple.csv') ?></i>
+
+    <h3><i>  <?= Yii::t('app', 'Dataset rules') ?></i></h3>
+    <!--    <br>
+        <div class="alert alert-info" role="alert">
+            <b><?= Yii::t('app/messages', 'File Rules') ?> : </b>
+            <ul>
+                <li><?= Yii::t('app/messages', 'CSV separator must be') ?> "<b><?= Yii::$app->params['csvSeparator'] ?></b>"</li>
+                <li><?= Yii::t('app/messages', 'Decimal separator for numeric values must be') ?> "<b>.</b>"</li>
+            </ul>
+            <br/>
+            <b><?= Yii::t('app', 'Columns') ?> : </b>
+            <table class="table table-hover" id="dataset-csv-columns-desc">
+                <tr>
+                    <th style="color:red">ScientificObjectAlias *</th>
+                    <td><?= Yii::t('app/messages', 'The ALIAS of the scientific object for the choosen experiment (e.g MTP_WW_2019_P050_SH1_2018_LF14)') ?></td>
+                </tr>
+                <tr>
+                    <th style="color:red">Date *</th>
+                    <td><p><?= Yii::t('app/messages', 'Acquisition date of the data') ?> (format ISO 8601: YYYY-MM-DD or YYYY-MM-DDTHH:mm:ssZ) </p> </td>
+                </tr>
+                <tr class="dataset-variables">
+                    <th style="color:red">Variable value *</th>
+                    <td ><?= Yii::t('app', 'Variable value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)</td>
+                </tr>
+            </table>
+        </div>-->
+    <hr style="border-color:gray;"/>    
+    <h3><i>  <?= Yii::t('app', 'Dataset input file') ?></i></h3>
+
+<?=
+$form->field($model, 'file')->widget(FileInput::classname(), [
+    'options' => [
+        'maxFileSize' => 2000,
+        'pluginOptions' => ['allowedFileExtensions' => ['csv'], 'showUpload' => false],
+    ]
+]);
+?>
 
     <div class="form-group">
-        <?= Html::submitButton(Yii::t('yii' , 'Create') , ['class' => 'btn btn-success']) ?>
+<?= Html::submitButton(Yii::t('yii', 'Save dataset'), ['class' => 'btn btn-success']) ?>
     </div>
 
-    <?php ActiveForm::end(); ?>
+<?php ActiveForm::end(); ?>
 
     <div class="modal fade" id="document-modal" tabindex="-1" role="dialog" aria-labelledby="document-modal-title">
         <div class="modal-dialog">
@@ -298,56 +322,58 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-success" id="document-save"><?php echo Html::encode(Yii::t('yii', 'Create')) ?></button>
-                     <button type="button" class="btn btn-default modal-close" data-dismiss="modal"><?php echo Html::encode(Yii::t('yii', 'Close')) ?></button>
+                    <button type="button" class="btn btn-default modal-close" data-dismiss="modal"><?php echo Html::encode(Yii::t('yii', 'Close')) ?></button>
                 </div>
             </div>
         </div>
     </div>
 
     <script>
-    $(document).ready(function(){
-        // Load document add form popin
-        $('#document-content').load('<?php echo Url::to(['document/create-from-dataset']) ?>');
-        
-        var documentUploaded = false;
-        // Clear last uploaded document line if document add form is canceled
-        $('#document-modal').on('hidden.bs.modal', function () {
-            if (!documentUploaded) {
-                $(".js-input-remove:last").click();
-            }
-            documentUploaded = false;
-            
-            $('#document-content form').trigger('reset');
+        $(document).ready(function () {
+            // Load document add form popin
+            $('#document-content').load('<?php echo Url::to(['document/create-from-dataset']) ?>');
+
+            var documentUploaded = false;
+            // Clear last uploaded document line if document add form is canceled
+            $('#document-modal').on('hidden.bs.modal', function () {
+                if (!documentUploaded) {
+                    $(".js-input-remove:last").click();
+                }
+                documentUploaded = false;
 
-            $('#document-save-msg').parent().removeClass('alert-danger');
-            $('#document-save-msg').parent().addClass('alert-info');
-            $('#document-save-msg').html('<?php echo Yii::t('app/messages', 'Request text'); ?>');
-        });
+                $('#document-content form').trigger('reset');
 
-        $(document).on('change', '#uriVariable-selector', function() {
-            $(".dataset-variables").remove();
-              $("#uriVariable-selector :selected").each(function (i,sel) {
+                $('#document-save-msg').parent().removeClass('alert-danger');
+                $('#document-save-msg').parent().addClass('alert-info');
+                $('#document-save-msg').html('<?php echo Yii::t('app/messages', 'Request text'); ?>');
+            });
+
+            $(document).on('change', '#uriVariable-selector', function () {
+                $(".dataset-variables").remove();
+                $("#uriVariable-selector :selected").each(function (i, sel) {
                     $('#dataset-csv-columns-desc').append(
                             '<tr class="dataset-variables">'
-                                + '<th style="color:red" >'
-                                    + $(sel).text() + ' *'
-                                + '</th>'
-                                + '<td>'
-                                    + '<?php echo Yii::t("app/messages", "Value"); ?> (<?php echo Yii::t('app', 'Real number, String or Date'); ?>)'
-                                + '</td>'
+                            + '<th style="color:red" >'
+                            + $(sel).text() + ' *'
+                            + '</th>'
+                            + '<td>'
+                            + '<?php echo Yii::t("app/messages", "Value"); ?> (<?php echo Yii::t('app', 'Real number, String or Date'); ?>)'
+                            + '</td>'
                             + '</tr>');
-                  });
-        });
+                });
+            });
+
+           
 
-        // Initial document count
-        var nbDocuments = -1;
-        $(document).on('click', '#document-save', function () {
+            // Initial document count
+            var nbDocuments = -1;
+            $(document).on('click', '#document-save', function () {
                 // On save get document form values
                 var formData = new FormData();
                 var file_data = $('#document-content #yiidocumentmodel-file').prop('files')[0];
                 formData.append('file', file_data);
                 var other_data = $('form').serializeArray();
-                $.each(other_data, function(key, input) {
+                $.each(other_data, function (key, input) {
                     formData.append(input.name, input.value);
                 });
 
@@ -361,51 +387,75 @@
                     data: formData
 
                 })
-                .done(function (data) {
-                    // Add document URI and close document add form
-                    $('#yiidatasetmodel-documentsuris-documenturi-' + nbDocuments).val(data);
-                    documentUploaded = true;
-                    $('#document-modal').modal('toggle');
+                        .done(function (data) {
+                            // Add document URI and close document add form
+                            $('#yiidatasetmodel-documentsuris-documenturi-' + nbDocuments).val(data);
+                            documentUploaded = true;
+                            $('#document-modal').modal('toggle');
+
+                        })
+                        .fail(function (jqXHR, textStatus) {
+                            // Disaply errors
+                            $('#document-save-msg').parent().removeClass('alert-info');
+                            $('#document-save-msg').parent().addClass('alert-danger');
+                            $('#document-save-msg').html('Request failed: ' + textStatus);
+                        });
 
-                })
-                .fail(function (jqXHR, textStatus) {
-                    // Disaply errors
-                    $('#document-save-msg').parent().removeClass('alert-info');
-                    $('#document-save-msg').parent().addClass('alert-danger');
-                    $('#document-save-msg').html('Request failed: ' + textStatus);
-                });
-                
                 return false;
-        });
+            });
 
-        // Open document add form on click
-        $('.buttonDocuments').click(function() {
-            nbDocuments++;
-            typeInsertedDocument = "document";
-            $('#document-modal').modal('toggle');
-        });
+            // Open document add form on click
+            $('.buttonDocuments').click(function () {
+                nbDocuments++;
+                typeInsertedDocument = "document";
+                $('#document-modal').modal('toggle');
+            });
 
-        // Download adjusted to variables CSV template file on click
-        $(document).on('change', '#uriVariable-selector', function () {
-            var variablesLabels = [];
-            $("#uriVariable-selector :selected").each(function (i,sel) {
-                variablesLabels.push($(sel).text());
-              });
+            // Download adjusted to variables CSV template file on click
+            $(document).on('change', '#uriVariable-selector', function () {
+                var variablesLabels = [];
+                $("#uriVariable-selector :selected").each(function (i, sel) {
+                    variablesLabels.push($(sel).text());
+                });
+                $.ajax({
+                    url: 'index.php?r=dataset%2Fgenerate-and-download-dataset-creation-file',
+                    type: 'POST',
+                    datatype: 'json',
+                    data: {variables: variablesLabels}
+                })
+                        .done(function (data) {
+                        })
+                        .fail(function (jqXHR, textStatus) {
+                            $('#document-save-msg').parent().removeClass('alert-info');
+                            $('#document-save-msg').parent().addClass('alert-danger');
+                            $('#document-save-msg').html('Request failed: ' + textStatus);
+                        });
+            });
+
+        });
+        
+        function populateVariableList(experimentUri){
+            var select = $('#uriVariable-selector');
+            var settings = select.attr('data-krajee-select2'),
+            id = select.attr('id');
+            settings = window[settings];
+            
             $.ajax({
-                url: 'index.php?r=dataset%2Fgenerate-and-download-dataset-creation-file',
-                type: 'POST',
-                datatype: 'json',
-                data: {variables: variablesLabels}
+                url: '<?= Url::toRoute(['dataset/get-experiment-mesured-variables-select-list']); ?>',
+                type: 'GET',
+                dataType: 'json',
+                data: {"experimentUri": experimentUri}
             })
-                    .done(function (data) {
-                    })
-                    .fail(function (jqXHR, textStatus) {
-                        $('#document-save-msg').parent().removeClass('alert-info');
-                        $('#document-save-msg').parent().addClass('alert-danger');
-                        $('#document-save-msg').html('Request failed: ' + textStatus);
-                    });
-        });
-
-    });
+            .done(function (data) {
+                
+                settings.data = data.data;
+                console.log(settings);
+                select.select2(settings);
+            })
+            .fail(function (jqXHR, textStatus) {
+                // Disaply errors
+                console.log(jqXHR)
+            });
+        }
     </script>
 </div>

From 3dc258c209fe74dcacf8052f18ee80067178d7e1 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Thu, 21 Nov 2019 08:50:58 +0100
Subject: [PATCH 14/35] Update view controller and Dataset

---
 controllers/DatasetController.php             |  37 +-----
 models/yiiModels/YiiDatasetModel.php          |   4 +-
 views/dataset/_form.php                       | 121 +++++++++++-------
 .../DatasetFiles/coma/datasetExemple.csv      |  14 +-
 .../coma/datasetSensorExemple.csv             |   1 -
 .../coma/datasetSensorTemplate.csv            |   1 -
 .../DatasetFiles/coma/datasetTemplate.csv     |   2 +-
 .../DatasetFiles/semicolon/datasetExemple.csv |  14 +-
 .../semicolon/datasetSensorExemple.csv        |   8 --
 .../semicolon/datasetSensorTemplate.csv       |   1 -
 .../semicolon/datasetTemplate.csv             |   2 +-
 11 files changed, 94 insertions(+), 111 deletions(-)
 delete mode 100755 web/documents/DatasetFiles/coma/datasetSensorExemple.csv
 delete mode 100755 web/documents/DatasetFiles/coma/datasetSensorTemplate.csv
 delete mode 100755 web/documents/DatasetFiles/semicolon/datasetSensorExemple.csv
 delete mode 100755 web/documents/DatasetFiles/semicolon/datasetSensorTemplate.csv

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index ed6cb35f..e7c63216 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -52,11 +52,6 @@ class DatasetController extends Controller {
     const ERRORS_COLUMN = "Column";
     const ERRORS_MESSAGE = "Message";
     
-    const SENSORS_DATA = "sensors";
-    const SENSOR_DATA_URI = "sensorUri";
-    const SENSOR_DATA_LABEL = "sensorLabel";
-    const SENSOR_DATA_TYPE = "sensorType";
-
     const PROVENANCE_PARAMS_VALUES = "provenanceNamespaces";
     /**
      * define the behaviors
@@ -143,30 +138,6 @@ public function actionGenerateAndDownloadDatasetCreationFile() {
         fclose($file);
     }
     
-    /**
-     * generate the csv file for the sensor dataset creation action. The csv file is
-     * generated with a column for each variable
-     * @param array variables list of the variables to add to the 
-     *                                file uri => alias
-     * @return mixed
-     */
-    public function actionGenerateAndDownloadDatasetSensorCreationFile() {
-        $fileColumns[] = DatasetController::DATE;
-        $variables = Yii::$app->request->post('variables');
-        foreach ($variables as $variableAlias) {
-            $fileColumns[] = $variableAlias;
-        }
-
-        $csvPath = "coma";
-        if (Yii::$app->params['csvSeparator'] == ";") {
-            $csvPath = "semicolon";
-        }
-        
-        $file = fopen('./documents/DatasetFiles/' . $csvPath . '/datasetSensorTemplate.csv', 'w');
-        fputcsv($file, $fileColumns, $delimiter = Yii::$app->params['csvSeparator']);
-        fclose($file);
-    }
-    
     /**
      * 
      * @param type $experimentUri
@@ -407,7 +378,7 @@ public function actionCreate() {
             $experimentVariables = $this->getExperimentMesuredVariablesSelectList($datasetModel->experiment) ;
             $csvVariables = array_slice($csvHeaders, 2);
             // select all variables that don"t exist in experiment variables
-            $variablesNotInExperiment = array_diff($csvVariables, $experimentVariables);
+            $variablesNotInExperiment = array_diff($csvVariables, array_values($experimentVariables)); 
             // Check CSV header with variables
             if (count($variablesNotInExperiment) === 0) {
                 // Get selected or create Provenance URI
@@ -456,7 +427,7 @@ public function actionCreate() {
                             $row = str_getcsv($rowStr, Yii::$app->params['csvSeparator']);
                             $scientifObjectAlias = $row[0];
                             if(!array_search($scientifObjectAlias, $objectUris)){
-                                $objectsErrors[] = $scientifObjectAlias .  Yii::t("app/messages", " Object doesn't not exists in this experiment");
+                                $objectsErrors[] = $scientifObjectAlias .  Yii::t("app/messages", " Object does not exists in this experiment");
                                 $scientifObjectUri = null;
                             }else{
                                 $scientifObjectUri = array_search($scientifObjectAlias, $objectUris);
@@ -466,7 +437,7 @@ public function actionCreate() {
                                 $values[] = [
                                     "provenanceUri" => $provenanceUri,
                                     "objectUri" => $scientifObjectUri,
-                                    "variableUri" => array_search($givenVariables[$i - 2], $variables),
+                                    "variableUri" => array_search($csvVariables[$i - 2], $experimentVariables),
                                     "date" => $date,
                                     "value" => $row[$i]
                                 ];
@@ -520,7 +491,7 @@ public function actionCreate() {
                 return $this->render('create', [
                             'model' => $datasetModel,
                             'errors' => [
-                                Yii::t("app/messages", "CSV file headers does not match selected variables (" . implode(",", $variablesNotInExperiment) . ")")
+                                Yii::t("app/messages", "CSV file headers does not match variables used in this experiment. The following Variables are not associated to this experiment " ) . "(" . implode(",", $variablesNotInExperiment) . ")"
                             ]
                 ]);
             }
diff --git a/models/yiiModels/YiiDatasetModel.php b/models/yiiModels/YiiDatasetModel.php
index e4121ca2..97f2f0f4 100755
--- a/models/yiiModels/YiiDatasetModel.php
+++ b/models/yiiModels/YiiDatasetModel.php
@@ -127,11 +127,11 @@ public function rules() {
      */
     public function attributeLabels() {
         return [
-            'provenanceUri' => Yii::t('app', 'Provenance (URI)'),
+            'provenanceUri' => Yii::t('app', 'Provenance label'),
             'provenanceComment' => Yii::t('app', 'Provenance comment'),
             'provenanceSensingDevices' => Yii::t('app', 'Sensor'),
             'provenanceAgents' => Yii::t('app', 'Operator'),
-            'variables' => Yii::t('app', 'Variable(s)'),
+            'variables' => Yii::t('app', 'Experiment associated variable(s)'),
             'file' => Yii::t('app', 'Data file'),
             'documentsUris' => Yii::t('app', 'Documents'),
             'experiment' => Yii::t('app', 'Experiment')
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index aa0d79f3..73b85d7a 100755
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -101,15 +101,17 @@
 ]);
 ?>
 
-
-
-    <hr style="border-color : gray;"/>
+    
+    <div class="row">
     <h4><?= Yii::t('app', 'Provenance'); ?></h4>
 
+    <p class="alert alert-info"><?= Yii::t('app/messages', 'To create a new provenance, tape the provenance label in the research field and press `Enter`'); ?></p>
+
+    <div class="col-sm-12 col-md-11 col-md-offset-1">
     <script>
         $(document).ready(function () {
 <?php
-// Create Provenance select values array
+// Create Provenance select value<div class="collapse" id="collapseExample">s array
 foreach ($this->params['provenances'] as $uri => $provenance) {
     $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
 }
@@ -126,7 +128,6 @@
             // Function to update provenance comment field depending of selected URI
             var updateProvenanceFields = function (uri) {
                 if (provenances.hasOwnProperty(uri)) {
-//                    console.log(provenances[uri]);
                     // If selected provenance is known get its comment
                     var comment = provenances[uri]["comment"];
 
@@ -142,7 +143,6 @@
                         var provenanceAgents = provenances[uri]["metadata"]["prov:Agent"]["oeso:Operator"];
                         $("#yiidatasetmodel-provenanceagents").val(provenanceAgents);
                         $("#yiidatasetmodel-provenanceagents").trigger("change");
-//                        console.log(provenanceAgents);
                     } catch (error) {
                         $("#yiidatasetmodel-provenanceagents").val([]);
                         $("#yiidatasetmodel-provenanceagents").trigger("change");
@@ -231,21 +231,23 @@
         ],
     ])->label(false)
     ?>
- 
-
+    </div>
+    </div>
+    <hr>
+    <hr style="border-color:gray;"/>
     <h3><i>  <?= Yii::t('app', 'Dataset template generation') ?></i></h3>
+    <p class="alert alert-info"><?= Yii::t('app/messages', 'Please, select a experiment to fill this dropdown'); ?></p>
     <?php
     $select2VariablesOptions =  [
-            'placeholder' => Yii::t('app/messages', 'Select one or many variables') . ' ...',
+            'placeholder' => Yii::t('app/messages', 'Select one or many experiment associated variables') . ' ...',
             'id' => 'uriVariable-selector',
             'multiple' => true
         ]; 
     ?>
     
-    
     <?=
     $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(), [
-        'data' => $this->params['variables'],
+        'data' => [],
         'options' => $select2VariablesOptions,
         'pluginOptions' => [
             'allowClear' => true,
@@ -260,15 +262,23 @@
     $csvPath = "semicolon";
 }
 ?>
-        <i><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Template'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetTemplate.csv', ['id' => 'downloadDatasetTemplate']) ?></i>
+    <i>
+    <?= 
+        Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download generated template'),
+            \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetTemplate.csv',
+            ['id' => 'downloadDatasetTemplate']
+        );
+    ?>
+    </i>
     </p>
-    
-    <hr style="border-color:gray;"/>
+    <hr>
     <hr style="border-color:gray;"/>
     <i style="float: right"><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Example'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetExemple.csv') ?></i>
 
-    <h3><i>  <?= Yii::t('app', 'Dataset rules') ?></i></h3>
-    <!--    <br>
+    <h3><i> <a data-toggle="collapse" href="#collapseDataSetRules" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
+             <?= Yii::t('app', 'Dataset rules') ?> </a></i></h3>
+    <div class="collapse" id="collapseDataSetRules">
+        <br>
         <div class="alert alert-info" role="alert">
             <b><?= Yii::t('app/messages', 'File Rules') ?> : </b>
             <ul>
@@ -291,7 +301,8 @@
                     <td ><?= Yii::t('app', 'Variable value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)</td>
                 </tr>
             </table>
-        </div>-->
+        </div>
+    </div>
     <hr style="border-color:gray;"/>    
     <h3><i>  <?= Yii::t('app', 'Dataset input file') ?></i></h3>
 
@@ -350,17 +361,26 @@
 
             $(document).on('change', '#uriVariable-selector', function () {
                 $(".dataset-variables").remove();
-                $("#uriVariable-selector :selected").each(function (i, sel) {
+                if($("#uriVariable-selector :selected").length > 0){
+                    $("#uriVariable-selector :selected").each(function (i, sel) {
+                        $('#dataset-csv-columns-desc').append(
+                                '<tr class="dataset-variables">'
+                                + '<th style="color:red" >'
+                                + $(sel).text() + ' *'
+                                + '</th>'
+                                + '<td>'
+                                + '<?php echo Yii::t("app/messages", "Value"); ?> (<?php echo Yii::t('app', 'Real number, String or Date'); ?>)'
+                                + '</td>'
+                                + '</tr>');
+                    }); 
+                }else{
                     $('#dataset-csv-columns-desc').append(
-                            '<tr class="dataset-variables">'
-                            + '<th style="color:red" >'
-                            + $(sel).text() + ' *'
-                            + '</th>'
-                            + '<td>'
-                            + '<?php echo Yii::t("app/messages", "Value"); ?> (<?php echo Yii::t('app', 'Real number, String or Date'); ?>)'
-                            + '</td>'
-                            + '</tr>');
-                });
+                                '<tr class="dataset-variables">'
+                              + '<th style="color:red">Variable value *</th>'
+                              + '<td ><?= Yii::t('app', 'Variable value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)'
+                              + '</td>'
+                              + '</tr>');
+                }
             });
 
            
@@ -431,31 +451,34 @@
                             $('#document-save-msg').html('Request failed: ' + textStatus);
                         });
             });
-
+            
+            populateVariableList($("#experiment-selector").val());
         });
         
         function populateVariableList(experimentUri){
-            var select = $('#uriVariable-selector');
-            var settings = select.attr('data-krajee-select2'),
-            id = select.attr('id');
-            settings = window[settings];
-            
-            $.ajax({
-                url: '<?= Url::toRoute(['dataset/get-experiment-mesured-variables-select-list']); ?>',
-                type: 'GET',
-                dataType: 'json',
-                data: {"experimentUri": experimentUri}
-            })
-            .done(function (data) {
-                
-                settings.data = data.data;
-                console.log(settings);
-                select.select2(settings);
-            })
-            .fail(function (jqXHR, textStatus) {
-                // Disaply errors
-                console.log(jqXHR)
-            });
+            if(experimentUri !== undefined && experimentUri !== null ){
+                var select = $('#uriVariable-selector');
+                var settings = select.attr('data-krajee-select2'),
+                id = select.attr('id');
+                settings = window[settings];
+
+                $.ajax({
+                    url: '<?= Url::toRoute(['dataset/get-experiment-mesured-variables-select-list']); ?>',
+                    type: 'GET',
+                    dataType: 'json',
+                    data: {"experimentUri": experimentUri}
+                })
+                .done(function (data) {
+
+                    settings.data = data.data;
+                    console.log(settings);
+                    select.select2(settings);
+                })
+                .fail(function (jqXHR, textStatus) {
+                    // Disaply errors
+                    console.log(jqXHR)
+                });
+            }
         }
     </script>
 </div>
diff --git a/web/documents/DatasetFiles/coma/datasetExemple.csv b/web/documents/DatasetFiles/coma/datasetExemple.csv
index 0f00b05b..9c670954 100755
--- a/web/documents/DatasetFiles/coma/datasetExemple.csv
+++ b/web/documents/DatasetFiles/coma/datasetExemple.csv
@@ -1,8 +1,8 @@
-ScientificObjectURI,Date,trait-1_method-A_dimensionless-unit,trait-2_method-B_dimensionless-unit,trait-3_method-C_dimensionless-unit
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035,2019-09-12T15:51:00Z,2019-09-12,"red",-12
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035,2019-09-13T12:51:00Z,2019-09-13,"red",13e12
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035,2019-09-14T18:51:00Z,2019-09-14,"red",-0.000000000000000141
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035,2019-09-15T10:51:00Z,2019-09-15,"blue",-0.15
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035,2019-09-16T09:51:00Z,2019-09-16,"red",16
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035,2019-09-17T08:51:30Z,2019-09-17,"blue",17
+ScientificObjectAlias,Date,trait-1_method-A_dimensionless-unit,trait-2_method-B_dimensionless-unit,trait-3_method-C_dimensionless-unit
+7/DKC4590/XXXX/WW/1/DIA2017-05-19,2019-09-12T15:51:00Z,2019-09-12,"red",-12
+7/DKC4590/XXXX/WW/1/DIA2017-05-19,2019-09-13T12:51:00Z,2019-09-13,"red",13e12
+7/DKC4590/XXXX/WW/1/DIA2017-05-19,2019-09-14T18:51:00Z,2019-09-14,"red",-0.000000000000000141
+7/DKC4590/XXXX/WW/1/DIA2017-05-19,2019-09-15T10:51:00Z,2019-09-15,"blue",-0.15
+7/DKC4590/XXXX/WW/1/DIA2017-05-19,2019-09-16T09:51:00Z,2019-09-16,"red",16
+7/DKC4590/XXXX/WW/1/DIA2017-05-19,2019-09-17T08:51:30Z,2019-09-17,"blue",17
 
diff --git a/web/documents/DatasetFiles/coma/datasetSensorExemple.csv b/web/documents/DatasetFiles/coma/datasetSensorExemple.csv
deleted file mode 100755
index 9a90a77c..00000000
--- a/web/documents/DatasetFiles/coma/datasetSensorExemple.csv
+++ /dev/null
@@ -1 +0,0 @@
-Date,GlobalRadiation_InstantGlobalRadiation_WattPerSquareMeter,WindSpeed_TenMinutesMaxWindSpeed_MeterPerSecond
diff --git a/web/documents/DatasetFiles/coma/datasetSensorTemplate.csv b/web/documents/DatasetFiles/coma/datasetSensorTemplate.csv
deleted file mode 100755
index 8b823655..00000000
--- a/web/documents/DatasetFiles/coma/datasetSensorTemplate.csv
+++ /dev/null
@@ -1 +0,0 @@
-Date,Variable
diff --git a/web/documents/DatasetFiles/coma/datasetTemplate.csv b/web/documents/DatasetFiles/coma/datasetTemplate.csv
index a84d9634..cee1bbd3 100755
--- a/web/documents/DatasetFiles/coma/datasetTemplate.csv
+++ b/web/documents/DatasetFiles/coma/datasetTemplate.csv
@@ -1 +1 @@
-ScientificObjectURI,Date,Value
+ScientificObjectAlias,Date,Variable value
diff --git a/web/documents/DatasetFiles/semicolon/datasetExemple.csv b/web/documents/DatasetFiles/semicolon/datasetExemple.csv
index 00876924..1fe6a76e 100755
--- a/web/documents/DatasetFiles/semicolon/datasetExemple.csv
+++ b/web/documents/DatasetFiles/semicolon/datasetExemple.csv
@@ -1,8 +1,8 @@
-ScientificObjectURI;Date;trait-1_method-A_dimensionless-unit;trait-2_method-B_dimensionless-unit;trait-3_method-C_dimensionless-unit
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035;2019-09-12T15:51:00Z;2019-09-12;"red";-12
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035;2019-09-13T12:51:00Z;2019-09-13;"red";13e12
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035;2019-09-14T18:51:00Z;2019-09-14;"red";-0.000000000000000141
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035;2019-09-15T10:51:00Z;2019-09-15;"blue";-0.15
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035;2019-09-16T09:51:00Z;2019-09-16;"red";16
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035;2019-09-17T08:51:30Z;2019-09-17;"blue";17
+ScientificObjectAlias;Date;trait-1_method-A_dimensionless-unit;trait-2_method-B_dimensionless-unit;trait-3_method-C_dimensionless-unit
+7/DKC4590/XXXX/WW/1/DIA2017-05-19;2019-09-12T15:51:00Z;2019-09-12;"red";-12
+7/DKC4590/XXXX/WW/1/DIA2017-05-19;2019-09-13T12:51:00Z;2019-09-13;"red";13e12
+7/DKC4590/XXXX/WW/1/DIA2017-05-19;2019-09-14T18:51:00Z;2019-09-14;"red";-0.000000000000000141
+7/DKC4590/XXXX/WW/1/DIA2017-05-19;2019-09-15T10:51:00Z;2019-09-15;"blue";-0.15
+7/DKC4590/XXXX/WW/1/DIA2017-05-19;2019-09-16T09:51:00Z;2019-09-16;"red";16
+7/DKC4590/XXXX/WW/1/DIA2017-05-19;2019-09-17T08:51:30Z;2019-09-17;"blue";17
 
diff --git a/web/documents/DatasetFiles/semicolon/datasetSensorExemple.csv b/web/documents/DatasetFiles/semicolon/datasetSensorExemple.csv
deleted file mode 100755
index d5701a87..00000000
--- a/web/documents/DatasetFiles/semicolon/datasetSensorExemple.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-Date;trait-1_method-A_dimensionless-unit;trait-2_method-B_dimensionless-unit;trait-3_method-C_dimensionless-unit
-2019-09-12T15:51:00Z;2019-09-12;"red";-12
-2019-09-13T12:51:00Z;2019-09-13;"red";13e12
-2019-09-14T18:51:00Z;2019-09-14;"red";-0.000000000000000141
-2019-09-15T10:51:00Z;2019-09-15;"blue";-0.15
-2019-09-16T09:51:00Z;2019-09-16;"red";16
-2019-09-17T08:51:30Z;2019-09-17;"blue";17
-
diff --git a/web/documents/DatasetFiles/semicolon/datasetSensorTemplate.csv b/web/documents/DatasetFiles/semicolon/datasetSensorTemplate.csv
deleted file mode 100755
index a9e4e9dd..00000000
--- a/web/documents/DatasetFiles/semicolon/datasetSensorTemplate.csv
+++ /dev/null
@@ -1 +0,0 @@
-Date;Value
\ No newline at end of file
diff --git a/web/documents/DatasetFiles/semicolon/datasetTemplate.csv b/web/documents/DatasetFiles/semicolon/datasetTemplate.csv
index 1e17cded..2091cc97 100755
--- a/web/documents/DatasetFiles/semicolon/datasetTemplate.csv
+++ b/web/documents/DatasetFiles/semicolon/datasetTemplate.csv
@@ -1 +1 @@
-ScientificObjectURI;Date;Value
+ScientificObjectAlias;Date;Variable value

From 7ece67fdb621f885cee77ecbd7d99a82cfa35f25 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Thu, 21 Nov 2019 09:00:34 +0100
Subject: [PATCH 15/35] Cleaning sensor code

---
 controllers/ActuatorController.php    |  2 +-
 models/wsModels/WSSensorModel.php     | 70 ---------------------------
 models/yiiModels/DeviceDataSearch.php | 30 +++---------
 views/sensor/_view_sensor_graph.php   | 19 +++-----
 4 files changed, 15 insertions(+), 106 deletions(-)

diff --git a/controllers/ActuatorController.php b/controllers/ActuatorController.php
index 100758a7..abfa54c1 100644
--- a/controllers/ActuatorController.php
+++ b/controllers/ActuatorController.php
@@ -354,7 +354,7 @@ public function actionSearchData() {
             
             // Get data
             $sessionToken = Yii::$app->session['access_token'];
-            $actuatorGraphData = $searchModel->getSensorData($sessionToken);
+            $actuatorGraphData = $searchModel->getEnvironmentData($sessionToken);
             
             // Render data
             return $this->renderAjax('_view_actuator_graph', [
diff --git a/models/wsModels/WSSensorModel.php b/models/wsModels/WSSensorModel.php
index 317764a3..99522b9d 100644
--- a/models/wsModels/WSSensorModel.php
+++ b/models/wsModels/WSSensorModel.php
@@ -118,74 +118,4 @@ public function putSensorVariables($sessionToken, $sensorUri, $variablesUri) {
         }
     }
     
-     /**
-     * Return the latest measured value for a variable and a sensor
-     * @param string $sessionToken
-     * @param string $provenanceUri
-     * @param string $variableUri
-     * @return mixed data or the error message 
-     */
-    public function getLastSensorVariableData($sessionToken,$variableUri, $sensorUri) {
-        // Define the parameter array
-        $params = [
-            "pageSize" => 1,
-            "page" => 0,
-            "variable" => $variableUri,
-            "dateSortAsc" => "false"
-        ];
-        $subService = "/" . urlencode($sensorUri) . "/data";
-        // Send the request
-        $requestRes = $this->get($sessionToken, $subService, $params);
-        // Return the first result data or null
-        if (isset($requestRes->{WSConstants::RESULT}->{WSConstants::DATA}))  {
-            if (count($requestRes->{WSConstants::RESULT}->{WSConstants::DATA}) > 0) {
-                return (array) $requestRes->{WSConstants::RESULT}->{WSConstants::DATA}[0];
-            } else {
-                return null;
-            }
-            
-        } else {
-            return $requestRes;
-        }
-    }
-    
-    
-    /**
-     * Return the 80000 first measured variable corresponding to the given parameters
-     * @param string $sessionToken
-     * @param string $sensorUri
-     * @param string $variableUri
-     * @param \DateTime $startDate
-     * @param \DateTime $endDate
-     * @return mixed data or the error message 
-     */
-    public function getAllSensorData($sessionToken, $sensorUri, $variableUri, $startDate, $endDate) {
-        // Define the parameter array
-        $params = [
-            "pageSize" => 80000,
-            "page" => 0,
-            "variable" => $variableUri,
-        ];
-        $subService = "/" . urlencode($sensorUri) . "/data";
-        
-        if ($startDate != null) {
-            $params["startDate"] = $startDate->format(WSDataModel::DATE_FORMAT);
-        }
-
-        if ($endDate != null) {
-            $params["endDate"] = $endDate->format(WSDataModel::DATE_FORMAT);
-        }
-        
-        $params["dateSortAsc"] = "true";
-        
-        // Send the request
-        $requestRes = $this->get($sessionToken, $subService, $params);
-        
-        // Return the result data
-        if (isset($requestRes->{WSConstants::RESULT}->{WSConstants::DATA}))  {
-            return (array) $requestRes->{WSConstants::RESULT}->{WSConstants::DATA};
-        } else {
-            return $requestRes;
-        }
-    }
 }
\ No newline at end of file
diff --git a/models/yiiModels/DeviceDataSearch.php b/models/yiiModels/DeviceDataSearch.php
index 341cd04c..621b9583 100644
--- a/models/yiiModels/DeviceDataSearch.php
+++ b/models/yiiModels/DeviceDataSearch.php
@@ -94,23 +94,16 @@ public function attributeLabels() {
      *      ]
      *  ]
      */
-    public function getSensorData($sessionToken) {
-        // Session provenance
-        $sessionProvenances = Yii::$app->session[self::SESSION_PROVENANCES];
-        if(!isset($sessionProvenances)){
-            $sessionProvenances = [];
-        }
-        // Create webservice instance
-        $wsData = new \app\models\wsModels\WSSensorModel();
-        $wsProv = new \app\models\wsModels\WSProvenanceModel();
+    public function getEnvironmentData($sessionToken) {
+        $ws = new WSEnvironmentModel();
         
         // Define start and end time period
         $dateTimeStart = null;
         $dateTimeEnd = null;
         
         if ($this->dateStart == null && $this->dateEnd == null) {
-            $date = null;
-            $lastData = $wsData->getLastSensorVariableData($sessionToken, $this->variableURI, $this->sensorURI);
+            // If no dates are defined get the last data for this sensor and variable
+            $lastData = $ws->getLastSensorVariableData($sessionToken, $this->sensorURI, $this->variableURI);
             // If no dates are defined get the last data for this sensor and variable
             
             // Get the last date if exists
@@ -118,7 +111,6 @@ public function getSensorData($sessionToken) {
             if ($lastData['date']) {
                 $lastDate = $lastData["date"];
             }
-
             // If last date found, compute the latest week period
             if ($lastDate != null) {
                 $dateTimeEnd = new \DateTime($lastDate);
@@ -146,15 +138,8 @@ public function getSensorData($sessionToken) {
         }
 
         // Get all data
-        $data = $wsData->getAllSensorData($sessionToken, $this->sensorURI, $this->variableURI, $dateTimeStart, $dateTimeEnd);
-        // Get specific associated provenance
-        foreach ($data as $d){
-            if(!isset($sessionProvenances[$d->provenanceUri])){
-                $specificProvenancesData = $wsProv->getSpecificProvenancesByCriteria($sessionToken,['uri' => $d->provenanceUri] );
-                $sessionProvenances[$d->provenanceUri] = $specificProvenancesData[0];
-                $d->provenanceLabel = $specificProvenancesData[0]->label;
-            }
-        }
+        $data = $ws->getAllSensorData($sessionToken, $this->sensorURI, $this->variableURI, $dateTimeStart, $dateTimeEnd);
+       
         // Construct result
         $result = [
             "graphName" => $this->graphName,
@@ -162,8 +147,7 @@ public function getSensorData($sessionToken) {
             "sensorUri" => $this->sensorURI,
             "dateStart" => $dateTimeStart,
             "dateEnd" => $dateTimeEnd,
-            "data" => $data,
-            "provenances" => $sessionProvenances
+            "data" => $data
         ];
         
         return $result;
diff --git a/views/sensor/_view_sensor_graph.php b/views/sensor/_view_sensor_graph.php
index 908b467d..73dbd926 100644
--- a/views/sensor/_view_sensor_graph.php
+++ b/views/sensor/_view_sensor_graph.php
@@ -24,27 +24,22 @@
  * ]
  */
 
-$series = [];
-
-foreach( $sensorGraphData["provenances"] as $provenance) {
-    $series[$provenance->uri]= [
-            "name" => $provenance->label,
-            "data" => []
-        ];
-}
+$serie = [
+    "name" => $sensorGraphData["graphName"],
+    "data" => []
+];
 
 //Create an array of data to store serie data by uri
 //array(1) { ["http://www.opensilex.org/sunagri/id/provenance/1572430583192"]=> array(2) { 
 //["name"]=> string(25) "new provs agent + sensor2" ["data"]=> array(0) { } } }
 if (is_array($sensorGraphData['data'])) {
     foreach ($sensorGraphData['data'] as $data) {
-        $series[$data->provenanceUri]['data'][] = [(strtotime($data->date))*1000, $data->value ];
+         $serie['data'][] = [(strtotime($data->date))*1000, $data->value ];
     }
-    //format data  - remove uri key
-    $series = array_values($series);
     
     // Display Hightchart widget
     echo Highcharts::widget([
+        
         // Create a unique ID for each graph based on variable URI
         'id' => base64_encode($sensorGraphData["variableUri"]),
         'options' => [
@@ -63,7 +58,7 @@
             'tooltip' => [
                'xDateFormat' => '%Y-%m-%d %H:%M'
              ],
-            'series' => $series,
+            'series' => [$serie],
         ]
     ]);
 }

From 20f2fa12edffc94650fceff91fa7d9ddd55b76db Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Thu, 21 Nov 2019 09:05:18 +0100
Subject: [PATCH 16/35] Clean sensor data

---
 controllers/SensorController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/SensorController.php b/controllers/SensorController.php
index 67e3bba1..6ab2f88c 100644
--- a/controllers/SensorController.php
+++ b/controllers/SensorController.php
@@ -313,7 +313,7 @@ public function actionView($id) {
         //get sensor's linked documents
         $searchDocumentModel = new DocumentSearch();
         $searchDocumentModel->concernedItemFilter = $id;
-        $documents = $searchDocumentModel->search(Yii::$app->session[WSConstants::ACCESS_TOKEN], ["concernedItem" => $id]);
+        $documents = $searchDocumentModel->search(Yii::$app->session['access_token'], ["concernedItem" => $id]);
         
         //3. get sensor annotations
         $searchAnnotationModel = new AnnotationSearch();
@@ -542,7 +542,7 @@ public function actionSearchData() {
             
             // Get data
             $sessionToken = Yii::$app->session[WSConstants::ACCESS_TOKEN];
-            $sensorGraphData = $searchModel->getSensorData($sessionToken);
+            $sensorGraphData = $searchModel->getEnvironmentData($sessionToken);
             // Render data
             return $this->renderAjax('_view_sensor_graph', [
                 'sensorGraphData' => $sensorGraphData

From 1608775b9f19454ca997db0f92f9b0c2bcc63f5e Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Thu, 21 Nov 2019 09:09:17 +0100
Subject: [PATCH 17/35] Cleanning code

---
 controllers/SensorController.php      |  1 +
 models/wsModels/WSSensorModel.php     |  1 -
 models/yiiModels/DeviceDataSearch.php | 15 +++++++--------
 views/sensor/_view_sensor_graph.php   |  8 ++------
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/controllers/SensorController.php b/controllers/SensorController.php
index 6ab2f88c..15491d73 100644
--- a/controllers/SensorController.php
+++ b/controllers/SensorController.php
@@ -543,6 +543,7 @@ public function actionSearchData() {
             // Get data
             $sessionToken = Yii::$app->session[WSConstants::ACCESS_TOKEN];
             $sensorGraphData = $searchModel->getEnvironmentData($sessionToken);
+            
             // Render data
             return $this->renderAjax('_view_sensor_graph', [
                 'sensorGraphData' => $sensorGraphData
diff --git a/models/wsModels/WSSensorModel.php b/models/wsModels/WSSensorModel.php
index 99522b9d..ed50d656 100644
--- a/models/wsModels/WSSensorModel.php
+++ b/models/wsModels/WSSensorModel.php
@@ -117,5 +117,4 @@ public function putSensorVariables($sessionToken, $sensorUri, $variablesUri) {
             return $requestRes;
         }
     }
-    
 }
\ No newline at end of file
diff --git a/models/yiiModels/DeviceDataSearch.php b/models/yiiModels/DeviceDataSearch.php
index 621b9583..f02cd208 100644
--- a/models/yiiModels/DeviceDataSearch.php
+++ b/models/yiiModels/DeviceDataSearch.php
@@ -10,6 +10,8 @@
 
 namespace app\models\yiiModels;
 use Yii;
+use \app\models\wsModels\WSEnvironmentModel;
+
 
 /**
  * implements the search action for the sensor data
@@ -46,11 +48,6 @@ class DeviceDataSearch extends \yii\base\Model {
      */
     public $graphName;
     
-    /**
-     * Store provenance data to prevent multiple calls to WS
-     */
-    const SESSION_PROVENANCES = 'store_provenances_infos';
-    
     /**
      * @inheritdoc
      */
@@ -95,6 +92,7 @@ public function attributeLabels() {
      *  ]
      */
     public function getEnvironmentData($sessionToken) {
+        // Create webservice instance
         $ws = new WSEnvironmentModel();
         
         // Define start and end time period
@@ -104,6 +102,7 @@ public function getEnvironmentData($sessionToken) {
         if ($this->dateStart == null && $this->dateEnd == null) {
             // If no dates are defined get the last data for this sensor and variable
             $lastData = $ws->getLastSensorVariableData($sessionToken, $this->sensorURI, $this->variableURI);
+            
             // If no dates are defined get the last data for this sensor and variable
             
             // Get the last date if exists
@@ -111,6 +110,7 @@ public function getEnvironmentData($sessionToken) {
             if ($lastData['date']) {
                 $lastDate = $lastData["date"];
             }
+            
             // If last date found, compute the latest week period
             if ($lastDate != null) {
                 $dateTimeEnd = new \DateTime($lastDate);
@@ -124,7 +124,6 @@ public function getEnvironmentData($sessionToken) {
             } else {
                 return null;
             }
-
         } else if ($this->dateStart == null) {
             // If only dateEnd is defined
             $dateTimeEnd = new \DateTime($this->dateEnd);
@@ -136,10 +135,10 @@ public function getEnvironmentData($sessionToken) {
             $dateTimeStart = new \DateTime($this->dateStart);
             $dateTimeEnd = new \DateTime($this->dateEnd);
         }
-
+        
         // Get all data
         $data = $ws->getAllSensorData($sessionToken, $this->sensorURI, $this->variableURI, $dateTimeStart, $dateTimeEnd);
-       
+                
         // Construct result
         $result = [
             "graphName" => $this->graphName,
diff --git a/views/sensor/_view_sensor_graph.php b/views/sensor/_view_sensor_graph.php
index 73dbd926..a7037aa5 100644
--- a/views/sensor/_view_sensor_graph.php
+++ b/views/sensor/_view_sensor_graph.php
@@ -23,20 +23,16 @@
  *      ]
  * ]
  */
-
 $serie = [
     "name" => $sensorGraphData["graphName"],
     "data" => []
 ];
 
-//Create an array of data to store serie data by uri
-//array(1) { ["http://www.opensilex.org/sunagri/id/provenance/1572430583192"]=> array(2) { 
-//["name"]=> string(25) "new provs agent + sensor2" ["data"]=> array(0) { } } }
 if (is_array($sensorGraphData['data'])) {
     foreach ($sensorGraphData['data'] as $data) {
-         $serie['data'][] = [(strtotime($data->date))*1000, $data->value ];
+        $serie['data'][] = [(strtotime($data->date))*1000, $data->value ];
     }
-    
+
     // Display Hightchart widget
     echo Highcharts::widget([
         

From 671b9a73bfc3a7800fb5d70c3ccfd3f8f3bf7e9d Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Thu, 21 Nov 2019 09:13:45 +0100
Subject: [PATCH 18/35] Cleaning files

---
 controllers/SensorController.php      | 1 -
 models/yiiModels/DeviceDataSearch.php | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/controllers/SensorController.php b/controllers/SensorController.php
index 15491d73..d5b781a8 100644
--- a/controllers/SensorController.php
+++ b/controllers/SensorController.php
@@ -33,7 +33,6 @@
  * @update [Vincent Migot] 7 November, 2018: Add sensor/variables link
  * @update [Vincent Migot] 19 November, 2018: Add visualization of environmental data
  * @update [Andréas Garcia] 11 March, 2019: Add event widget
- * @update [Arnaud Charleroy] 30 October, 2019: Add sensor data by data service
  * @author Morgane Vidal <morgane.vidal@inra.fr>
  * @author Arnaud Charleroy <arnaud.charleroy@inra.fr>
  */
diff --git a/models/yiiModels/DeviceDataSearch.php b/models/yiiModels/DeviceDataSearch.php
index f02cd208..73809508 100644
--- a/models/yiiModels/DeviceDataSearch.php
+++ b/models/yiiModels/DeviceDataSearch.php
@@ -12,7 +12,6 @@
 use Yii;
 use \app\models\wsModels\WSEnvironmentModel;
 
-
 /**
  * implements the search action for the sensor data
  * @author Vincent Migot <vincent.migot@inra.fr>
@@ -102,15 +101,13 @@ public function getEnvironmentData($sessionToken) {
         if ($this->dateStart == null && $this->dateEnd == null) {
             // If no dates are defined get the last data for this sensor and variable
             $lastData = $ws->getLastSensorVariableData($sessionToken, $this->sensorURI, $this->variableURI);
-            
-            // If no dates are defined get the last data for this sensor and variable
-            
+        
             // Get the last date if exists
             $lastDate = null;
             if ($lastData['date']) {
                 $lastDate = $lastData["date"];
             }
-            
+
             // If last date found, compute the latest week period
             if ($lastDate != null) {
                 $dateTimeEnd = new \DateTime($lastDate);
@@ -151,4 +148,4 @@ public function getEnvironmentData($sessionToken) {
         
         return $result;
     }
-}
+}
\ No newline at end of file

From e6c6ef044780d3e062c3d900903c1cc8c9c3126d Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Thu, 21 Nov 2019 09:15:30 +0100
Subject: [PATCH 19/35] Remove new line

---
 models/yiiModels/DeviceDataSearch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/yiiModels/DeviceDataSearch.php b/models/yiiModels/DeviceDataSearch.php
index 73809508..04fceba6 100644
--- a/models/yiiModels/DeviceDataSearch.php
+++ b/models/yiiModels/DeviceDataSearch.php
@@ -148,4 +148,4 @@ public function getEnvironmentData($sessionToken) {
         
         return $result;
     }
-}
\ No newline at end of file
+}

From b30aea0b61589f277e72021dac545f18cc17588d Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Thu, 21 Nov 2019 13:19:52 +0100
Subject: [PATCH 20/35] Update dataset from view

---
 views/dataset/_form.php | 58 +++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index 73b85d7a..0a2cec9d 100755
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -18,6 +18,7 @@
 use kartik\form\ActiveForm;
 use kartik\file\FileInput;
 use yii\helpers\Url;
+use kartik\icons\Icon;
 
 /* @var $this yii\web\View */
 /* @var $model app\models\YiiDatasetModel */
@@ -37,32 +38,33 @@
     <?= Yii::$app->session->getFlash('renderArray'); ?>
 
     <?php
-    if (isset($errors) && $errors !== null):
-        ?>
-        <div class="alert alert-danger" >
-            <h3 style="margin:3%;">Errors found in dataset :</h3>
-            <ul>
-                <?php
-                // Display error messages
-                $errorMessages = [];
-                foreach ($errors as $error) {
-                    if (is_string($error)) {
-                        $errorMessages[] = $error;
-                    } else {
-                        $errorMessages[] = $error->exception->details;
-                    }
-                }
-
-                $errorMessages = array_unique($errorMessages);
-                foreach ($errorMessages as $errorMessage) {
-                    echo '<li>' . $errorMessage . '</li>';
+        if (isset($errors) && $errors !== null):
+    ?>
+    <div class="alert alert-danger" >
+        <h3 style="margin:3%;">Errors found in datasensor :</h3>
+        <ul>
+        <?php 
+            // Display error messages
+            $errorMessages = [];
+            foreach($errors as $error) {
+                if (is_string($error)) {
+                    $errorMessages[] =  $error;
+                } else {
+                    $errorMessages[] =  $error->exception->details;
                 }
-                ?>
-            </ul>
-        </div>
+            }
+            
+            $errorMessages = array_unique($errorMessages);
+            foreach ($errorMessages as $errorMessage) {
+                 echo '<li>' . $errorMessage . '</li>';
+            }
+            
+        ?>
+        </ul>
+    </div>
     <?php
-endif;
-?>
+        endif;
+    ?>
     <?php
     if (isset($handsontable) && $handsontable !== null):
         ?>
@@ -102,12 +104,8 @@
 ?>
 
     
-    <div class="row">
     <h4><?= Yii::t('app', 'Provenance'); ?></h4>
-
     <p class="alert alert-info"><?= Yii::t('app/messages', 'To create a new provenance, tape the provenance label in the research field and press `Enter`'); ?></p>
-
-    <div class="col-sm-12 col-md-11 col-md-offset-1">
     <script>
         $(document).ready(function () {
 <?php
@@ -231,8 +229,6 @@
         ],
     ])->label(false)
     ?>
-    </div>
-    </div>
     <hr>
     <hr style="border-color:gray;"/>
     <h3><i>  <?= Yii::t('app', 'Dataset template generation') ?></i></h3>
@@ -276,7 +272,7 @@
     <i style="float: right"><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Example'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetExemple.csv') ?></i>
 
     <h3><i> <a data-toggle="collapse" href="#collapseDataSetRules" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
-             <?= Yii::t('app', 'Dataset rules') ?> </a></i></h3>
+             <?= Icon::show('question', ['class' => 'fa-large'], Icon::FA) . Yii::t('app', 'Dataset rules') ?> </a></i></h3>
     <div class="collapse" id="collapseDataSetRules">
         <br>
         <div class="alert alert-info" role="alert">

From 278c19e4ff27fcd7c798714034b96cdefc93bedb Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Mon, 25 Nov 2019 16:01:23 +0100
Subject: [PATCH 21/35] Udpate form view

---
 views/dataset/_form.php | 65 +++++++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 25 deletions(-)
 mode change 100755 => 100644 views/dataset/_form.php

diff --git a/views/dataset/_form.php b/views/dataset/_form.php
old mode 100755
new mode 100644
index 0a2cec9d..fc7e3e85
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -84,26 +84,30 @@
         <h3 class="alert alert-info" style="margin:3%;">Add dataset form</h3>
 <?php endif; ?>
     <h3><i>  <?= Yii::t('app', 'Required dataset informations') ?></i></h3>
-
-<?=
-$form->field($model, 'experiment')->widget(\kartik\select2\Select2::classname(), [
-    'data' => $this->params['experiments'],
-    'options' => [
-        'placeholder' => Yii::t('app/messages', 'Select one experiment') . ' ...',
-        'id' => 'experiment-selector',
-        'multiple' => false
-    ],
-    'pluginOptions' => [
-        'allowClear' => true,
-        'tags' => true
-    ],  
-    'pluginEvents' => [
-        'select2:select' => 'function(e) { populateVariableList(e.params.data.id); }',
-    ]
-]);
-?>
-
-    
+  <h3><i> <a data-toggle="collapse" href="#collapseExperiment" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
+             <?= "01. " . Yii::t('app', 'What is your experiment ?') ?> <span style="color:red"> *</span></a></i></h3>
+    <div class="collapse" id="collapseExperiment">
+        <?=
+        $form->field($model, 'experiment')->widget(\kartik\select2\Select2::classname(), [
+            'data' => $this->params['experiments'],
+            'options' => [
+                'placeholder' => Yii::t('app/messages', 'Select one experiment') . ' ...',
+                'id' => 'experiment-selector',
+                'multiple' => false
+            ],
+            'pluginOptions' => [
+                'allowClear' => true,
+                'tags' => true
+            ],  
+            'pluginEvents' => [
+                'select2:select' => 'function(e) { populateVariableList(e.params.data.id); }',
+            ]
+        ]);
+        ?>
+    </div>
+    <h3><i> <a data-toggle="collapse" href="#collapseProvenance" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
+             <?= "02. " . Yii::t('app', 'What is the provenance of your dataset ?') ?><span style="color:red"> *</span> </a></i></h3>
+    <div class="collapse" id="collapseProvenance">
     <h4><?= Yii::t('app', 'Provenance'); ?></h4>
     <p class="alert alert-info"><?= Yii::t('app/messages', 'To create a new provenance, tape the provenance label in the research field and press `Enter`'); ?></p>
     <script>
@@ -229,6 +233,10 @@
         ],
     ])->label(false)
     ?>
+    </div>
+    <h3><i> <a data-toggle="collapse" href="#collapseDatasteTemplate" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
+             <?= "03. " . Yii::t('app', 'Do you want to generate a dataset template ?') ?> </a></i></h3>
+    <div class="collapse" id="collapseDatasteTemplate">
     <hr>
     <hr style="border-color:gray;"/>
     <h3><i>  <?= Yii::t('app', 'Dataset template generation') ?></i></h3>
@@ -267,13 +275,10 @@
     ?>
     </i>
     </p>
+   
     <hr>
     <hr style="border-color:gray;"/>
     <i style="float: right"><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Example'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetExemple.csv') ?></i>
-
-    <h3><i> <a data-toggle="collapse" href="#collapseDataSetRules" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
-             <?= Icon::show('question', ['class' => 'fa-large'], Icon::FA) . Yii::t('app', 'Dataset rules') ?> </a></i></h3>
-    <div class="collapse" id="collapseDataSetRules">
         <br>
         <div class="alert alert-info" role="alert">
             <b><?= Yii::t('app/messages', 'File Rules') ?> : </b>
@@ -299,6 +304,9 @@
             </table>
         </div>
     </div>
+    <h3><i> <a data-toggle="collapse" href="#collapseSaveDataset" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
+             <?= "04. " . Yii::t('app', 'Save your dataset.') ?> </a></i></h3>
+    <div class="collapse" id="collapseSaveDataset">
     <hr style="border-color:gray;"/>    
     <h3><i>  <?= Yii::t('app', 'Dataset input file') ?></i></h3>
 
@@ -316,7 +324,7 @@
     </div>
 
 <?php ActiveForm::end(); ?>
-
+    <div >
     <div class="modal fade" id="document-modal" tabindex="-1" role="dialog" aria-labelledby="document-modal-title">
         <div class="modal-dialog">
             <div class="modal-content">
@@ -449,6 +457,13 @@
             });
             
             populateVariableList($("#experiment-selector").val());
+            
+            // collapse each group
+            $('.collapse').on('show.bs.collapse', function (e) {
+                $('.collapse').not($('#'+e.target.id)).each(function(){
+                    $(this).collapse('hide');
+                });
+            });
         });
         
         function populateVariableList(experimentUri){

From 74758d37f22ed2bb73b7c5deece356261129a8ba Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Tue, 26 Nov 2019 09:33:10 +0100
Subject: [PATCH 22/35] Update dataset view

---
 controllers/DatasetController.php |  71 +++--
 views/dataset/_form.php           | 437 ++++++++++++++++++------------
 2 files changed, 320 insertions(+), 188 deletions(-)

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index e7c63216..6d9f643d 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -138,6 +138,37 @@ public function actionGenerateAndDownloadDatasetCreationFile() {
         fclose($file);
     }
     
+    
+    /**
+     * 
+     * @param type $experimentUri
+     */
+    public function actionCreateProvenanceFromDataset(){
+        $token = Yii::$app->session[WSConstants::ACCESS_TOKEN];
+
+        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $provenance = Yii::$app->request->post();
+
+        $provenanceService = new WSProvenanceModel();
+        $provenanceUri = $this->createProvenance(
+                            $provenance['label'],
+                            $provenance['comment'],
+                            $provenance['sensingDevices'],
+                            $provenance['agents']
+                    );
+        
+        $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
+        $result = [];
+        $provenancesArray =[];
+        $result['newProvenanceUri'] = $provenanceUri;
+        foreach ($provenances as $uri => $provenance) {
+            $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
+        }
+        $result['provenances'] = $provenances;
+        $result['provenancesByUri'] = $provenancesArray;
+        return $result;
+    }
+    
     /**
      * 
      * @param type $experimentUri
@@ -343,8 +374,6 @@ private function addColumnErrorsAndMissingToArray($arrayData, $arrayErrors) {
      */
     public function actionCreate() {
         $datasetModel = new \app\models\yiiModels\YiiDatasetModel();
-        $variablesModel = new \app\models\yiiModels\YiiVariableModel();
-
         $token = Yii::$app->session[WSConstants::ACCESS_TOKEN];
 
         // Load existing provenances
@@ -382,30 +411,30 @@ public function actionCreate() {
             // Check CSV header with variables
             if (count($variablesNotInExperiment) === 0) {
                 // Get selected or create Provenance URI
-                if (!array_key_exists($datasetModel->provenanceUri, $provenances)) {
-                    $provenanceUri = $this->createProvenance(
-                            $datasetModel->provenanceUri,
-                            $datasetModel->provenanceComment,
-                            $datasetModel->provenanceSensingDevices,
-                            $datasetModel->provenanceAgents
-                    );
-                    $datasetModel->provenanceUri = $provenanceUri;
-                    $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
-                    $this->view->params["provenances"] = $provenances;
-                } else {
+//                if (!array_key_exists($datasetModel->provenanceUri, $provenances)) {
+//                    $provenanceUri = $this->createProvenance(
+//                            $datasetModel->provenanceUri,
+//                            $datasetModel->provenanceComment,
+//                            $datasetModel->provenanceSensingDevices,
+//                            $datasetModel->provenanceAgents
+//                    );
+//                    $datasetModel->provenanceUri = $provenanceUri;
+//                    $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
+//                    $this->view->params["provenances"] = $provenances;
+//                } else {
                     $provenanceUri = $datasetModel->provenanceUri;
-                }
+//                }
 
                 // If provenance sucessfully created
                 if ($provenanceUri) {
                     // Link uploaded documents to provenance URI
-                    $linkDocuments = true;
-                    if (is_array($datasetModel->documentsURIs) && is_array($datasetModel->documentsURIs["documentURI"])) {
-                        $linkDocuments = $this->linkDocumentsToProvenance(
-                                $provenanceUri,
-                                $datasetModel->documentsURIs["documentURI"]
-                        );
-                    }
+//                    $linkDocuments = true;
+//                    if (is_array($datasetModel->documentsURIs) && is_array($datasetModel->documentsURIs["documentURI"])) {
+//                        $linkDocuments = $this->linkDocumentsToProvenance(
+//                                $provenanceUri,
+//                                $datasetModel->documentsURIs["documentURI"]
+//                        );
+//                    }
                     // Load all objectsl inked to an experiment
                     
                     $SciencitificObjectSearch = new \app\models\yiiModels\ScientificObjectSearch();
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index fc7e3e85..12365c08 100644
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -18,7 +18,6 @@
 use kartik\form\ActiveForm;
 use kartik\file\FileInput;
 use yii\helpers\Url;
-use kartik\icons\Icon;
 
 /* @var $this yii\web\View */
 /* @var $model app\models\YiiDatasetModel */
@@ -83,10 +82,10 @@
 
         <h3 class="alert alert-info" style="margin:3%;">Add dataset form</h3>
 <?php endif; ?>
-    <h3><i>  <?= Yii::t('app', 'Required dataset informations') ?></i></h3>
-  <h3><i> <a data-toggle="collapse" href="#collapseExperiment" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
-             <?= "01. " . Yii::t('app', 'What is your experiment ?') ?> <span style="color:red"> *</span></a></i></h3>
-    <div class="collapse" id="collapseExperiment">
+    <h3><i>  <?= Yii::t('app', 'Steps to insert your dataset') ?></i></h3>
+  <h3><i> <a data-toggle="collapse" href="#step-01" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
+             <?= "1. " . Yii::t('app', 'Choose the experiment from where the dataset comes from') ?> <span style="color:red"> *</span></a></i></h3>
+    <div class="collapse" id="step-01" data-step="1">
         <?=
         $form->field($model, 'experiment')->widget(\kartik\select2\Select2::classname(), [
             'data' => $this->params['experiments'],
@@ -105,81 +104,108 @@
         ]);
         ?>
     </div>
-    <h3><i> <a data-toggle="collapse" href="#collapseProvenance" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
-             <?= "02. " . Yii::t('app', 'What is the provenance of your dataset ?') ?><span style="color:red"> *</span> </a></i></h3>
-    <div class="collapse" id="collapseProvenance">
+  
+    <h3><i> <a data-toggle="collapse" href="#step-02" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
+             <?= "2. " . Yii::t('app', 'Do you want to generate a dataset template ?') ?> </a></i></h3>
+    <div class="collapse" id="step-02" data-step="2">
+    <hr>
+    <hr style="border-color:gray;"/>
+    <h3><i>  <?= Yii::t('app', 'Dataset template generation') ?></i></h3>
+    <p class="alert alert-info"><?= Yii::t('app/messages', 'The variables below are associated to the choosen experiment'); ?></p>
+    <?php
+    $select2VariablesOptions =  [
+            'placeholder' => Yii::t('app/messages', 'Select one or many experiment associated variables') . ' ...',
+            'id' => 'uriVariable-selector',
+            'multiple' => true
+        ]; 
+    ?>
+    
+    <?=
+    $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(), [
+        'data' => [],
+        'options' => $select2VariablesOptions,
+        'pluginOptions' => [
+            'allowClear' => true,
+            'tags' => true
+        ],
+    ]);
+    ?>
+    <p>
+<?php
+$csvPath = "coma";
+if (Yii::$app->params['csvSeparator'] == ";") {
+    $csvPath = "semicolon";
+}
+?>
+    <i>
+    <?= 
+        Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download generated template'),
+            \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetTemplate.csv',
+            ['id' => 'downloadDatasetTemplate']
+        );
+    ?>
+    </i>
+    </p>
+   
+    <hr>
+    <hr style="border-color:gray;"/>
+    <i style="float: right"><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Example'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetExemple.csv') ?></i>
+        <br>
+        <div class="alert alert-info" role="alert">
+            <b><?= Yii::t('app/messages', 'File Rules') ?> : </b>
+            <ul>
+                <li><?= Yii::t('app/messages', 'CSV separator must be') ?> "<b><?= Yii::$app->params['csvSeparator'] ?></b>"</li>
+                <li><?= Yii::t('app/messages', 'Decimal separator for numeric values must be') ?> "<b>.</b>"</li>
+            </ul>
+            <br/>
+            <b><?= Yii::t('app', 'Columns') ?> : </b>
+            <table class="table table-hover" id="dataset-csv-columns-desc">
+                <tr>
+                    <th style="color:red">ScientificObjectAlias *</th>
+                    <td><?= Yii::t('app/messages', 'The ALIAS of the scientific object for the choosen experiment (e.g MTP_WW_2019_P050_SH1_2018_LF14)') ?></td>
+                </tr>
+                <tr>
+                    <th style="color:red">Date *</th>
+                    <td><p><?= Yii::t('app/messages', 'Acquisition date of the data') ?> (format ISO 8601: YYYY-MM-DD or YYYY-MM-DDTHH:mm:ssZ) </p> </td>
+                </tr>
+                <tr class="dataset-variables">
+                    <th style="color:red">Variable value *</th>
+                    <td ><?= Yii::t('app', 'Variable value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)</td>
+                </tr>
+            </table>
+        </div>
+    </div>
+      <h3><i> <a data-toggle="collapse" href="#step-03" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
+             <?= "3. " . Yii::t('app', 'Select or create a source that describes how the dataset was obtained') ?><span style="color:red"> *</span> </a></i></h3>
+    <div class="collapse" id="step-03" data-step="3">
     <h4><?= Yii::t('app', 'Provenance'); ?></h4>
-    <p class="alert alert-info"><?= Yii::t('app/messages', 'To create a new provenance, tape the provenance label in the research field and press `Enter`'); ?></p>
+    <p class="alert alert-info"><?= Yii::t('app/messages', 'To create a new provenance, write the provenance label in the research field and press `Enter`'); ?></p>
     <script>
-        $(document).ready(function () {
+    $(document).ready(function () {
 <?php
 // Create Provenance select value<div class="collapse" id="collapseExample">s array
 foreach ($this->params['provenances'] as $uri => $provenance) {
     $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
 }
 // Inject URI to get document widget linked to an URI
-echo 'var documentsLoadUri = "' . Url::to(['document/get-documents-widget']) . '";';
+echo 'documentsLoadUri = "' . Url::to(['document/get-documents-widget']) . '";';
 // Inject provenances list indexed by URI
-echo 'var provenances = ' . json_encode($this->params['provenances']) . ';';
+echo 'provenances = ' . json_encode($this->params['provenances']) . ';';
 // Inject sensingDevices list indexed by URI
-echo 'var sensingDevices = ' . json_encode($this->params['sensingDevices']) . ';';
+echo 'sensingDevices = ' . json_encode($this->params['sensingDevices']) . ';';
 // Inject agents list indexed by URI
-echo 'var agents = ' . json_encode($this->params['agents']) . ';';
+echo 'agents = ' . json_encode($this->params['agents']) . ';';
 ?>
 
-            // Function to update provenance comment field depending of selected URI
-            var updateProvenanceFields = function (uri) {
-                if (provenances.hasOwnProperty(uri)) {
-                    // If selected provenance is known get its comment
-                    var comment = provenances[uri]["comment"];
-
-                    // Set provenance comment, disable input and remove validation messages 
-                    $("#yiidatasetmodel-provenancecomment").val(comment).attr("disabled", "disabled");
-                    $(".field-yiidatasetmodel-provenancecomment, .field-yiidatasetmodel-provenancecomment *")
-                            .removeClass("has-error")
-                            .removeClass("has-success");
-                    $(".field-yiidatasetmodel-provenancecomment .help-block").empty();
-
-                    // Set provenance provenanceAgents, disable input and remove validation messages 
-                    try {
-                        var provenanceAgents = provenances[uri]["metadata"]["prov:Agent"]["oeso:Operator"];
-                        $("#yiidatasetmodel-provenanceagents").val(provenanceAgents);
-                        $("#yiidatasetmodel-provenanceagents").trigger("change");
-                    } catch (error) {
-                        $("#yiidatasetmodel-provenanceagents").val([]);
-                        $("#yiidatasetmodel-provenanceagents").trigger("change");
-                        console.log("No agents set");
-                    } finally {
-                        $("#yiidatasetmodel-provenanceagents").val(agents).attr("disabled", "disabled");
-                        $(".field-yiidatasetmodel-provenanceagents, .field-yiidatasetmodel-provenanceagents *")
-                                .removeClass("has-error")
-                                .removeClass("has-success");
-                        $(".field-yiidatasetmodel-provenanceagents .help-block").empty();
-                    }
-                    // Load linked documents
-                    $("#already-linked-documents").load(documentsLoadUri, {
-                        "uri": uri
-                    })
-                } else {
-                    // Otherwise clear provenance agents and enable input
-                    $("#yiidatasetmodel-provenanceagents").val(agents).removeAttr("disabled").trigger("change");
-
-                    // Otherwise clear provenance comment and enable input
-                    $("#yiidatasetmodel-provenancecomment").val("").removeAttr("disabled");
+        // On provenance change update provenance fields
+        $("#provenance-selector").change(function () {
+            updateProvenanceFields($(this).val());
+        });
 
-                    // Clear linked documents list
-                    $("#already-linked-documents").empty();
-                }
-            }
+        // Update provenance fields depending of startup value
+        updateProvenanceFields($("#provenance-selector").val());
 
-            // On provenance change update provenance fields
-            $("#provenance-selector").change(function () {
-                updateProvenanceFields($(this).val());
-            });
-
-            // Update provenance fields depending of startup value
-            updateProvenanceFields($("#provenance-selector").val());
-        });
+    });
     </script>
     <?=
     $form->field($model, 'provenanceUri')->widget(\kartik\select2\Select2::classname(), [
@@ -233,98 +259,30 @@
         ],
     ])->label(false)
     ?>
+    <?= Html::button(Yii::t('yii', 'Save provenance'), ['class' => 'btn btn-success','onclick' => 'saveProvenance()']) ?>
+
     </div>
-    <h3><i> <a data-toggle="collapse" href="#collapseDatasteTemplate" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
-             <?= "03. " . Yii::t('app', 'Do you want to generate a dataset template ?') ?> </a></i></h3>
-    <div class="collapse" id="collapseDatasteTemplate">
-    <hr>
-    <hr style="border-color:gray;"/>
-    <h3><i>  <?= Yii::t('app', 'Dataset template generation') ?></i></h3>
-    <p class="alert alert-info"><?= Yii::t('app/messages', 'Please, select a experiment to fill this dropdown'); ?></p>
-    <?php
-    $select2VariablesOptions =  [
-            'placeholder' => Yii::t('app/messages', 'Select one or many experiment associated variables') . ' ...',
-            'id' => 'uriVariable-selector',
-            'multiple' => true
-        ]; 
-    ?>
-    
-    <?=
-    $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(), [
-        'data' => [],
-        'options' => $select2VariablesOptions,
-        'pluginOptions' => [
-            'allowClear' => true,
-            'tags' => true
-        ],
-    ]);
-    ?>
-    <p>
-<?php
-$csvPath = "coma";
-if (Yii::$app->params['csvSeparator'] == ";") {
-    $csvPath = "semicolon";
-}
-?>
-    <i>
-    <?= 
-        Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download generated template'),
-            \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetTemplate.csv',
-            ['id' => 'downloadDatasetTemplate']
-        );
-    ?>
-    </i>
-    </p>
-   
-    <hr>
-    <hr style="border-color:gray;"/>
-    <i style="float: right"><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Example'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetExemple.csv') ?></i>
-        <br>
-        <div class="alert alert-info" role="alert">
-            <b><?= Yii::t('app/messages', 'File Rules') ?> : </b>
-            <ul>
-                <li><?= Yii::t('app/messages', 'CSV separator must be') ?> "<b><?= Yii::$app->params['csvSeparator'] ?></b>"</li>
-                <li><?= Yii::t('app/messages', 'Decimal separator for numeric values must be') ?> "<b>.</b>"</li>
-            </ul>
-            <br/>
-            <b><?= Yii::t('app', 'Columns') ?> : </b>
-            <table class="table table-hover" id="dataset-csv-columns-desc">
-                <tr>
-                    <th style="color:red">ScientificObjectAlias *</th>
-                    <td><?= Yii::t('app/messages', 'The ALIAS of the scientific object for the choosen experiment (e.g MTP_WW_2019_P050_SH1_2018_LF14)') ?></td>
-                </tr>
-                <tr>
-                    <th style="color:red">Date *</th>
-                    <td><p><?= Yii::t('app/messages', 'Acquisition date of the data') ?> (format ISO 8601: YYYY-MM-DD or YYYY-MM-DDTHH:mm:ssZ) </p> </td>
-                </tr>
-                <tr class="dataset-variables">
-                    <th style="color:red">Variable value *</th>
-                    <td ><?= Yii::t('app', 'Variable value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)</td>
-                </tr>
-            </table>
-        </div>
-    </div>
-    <h3><i> <a data-toggle="collapse" href="#collapseSaveDataset" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
-             <?= "04. " . Yii::t('app', 'Save your dataset.') ?> </a></i></h3>
-    <div class="collapse" id="collapseSaveDataset">
+    <h3><i> <a data-toggle="collapse" href="#step-04" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
+             <?= "4. " . Yii::t('app', 'Save your dataset.') ?> </a></i></h3>
+    <div class="collapse" id="step-04" data-step="4">
     <hr style="border-color:gray;"/>    
     <h3><i>  <?= Yii::t('app', 'Dataset input file') ?></i></h3>
 
-<?=
-$form->field($model, 'file')->widget(FileInput::classname(), [
-    'options' => [
-        'maxFileSize' => 2000,
-        'pluginOptions' => ['allowedFileExtensions' => ['csv'], 'showUpload' => false],
-    ]
-]);
-?>
+    <?=
+    $form->field($model, 'file')->widget(FileInput::classname(), [
+        'options' => [
+            'maxFileSize' => 2000,
+            'pluginOptions' => ['allowedFileExtensions' => ['csv'], 'showUpload' => false],
+        ]
+    ]);
+    ?>
 
     <div class="form-group">
-<?= Html::submitButton(Yii::t('yii', 'Save dataset'), ['class' => 'btn btn-success']) ?>
+    <?= Html::submitButton(Yii::t('yii', 'Save dataset'), ['class' => 'btn btn-success']) ?>
+    </div>
     </div>
-
 <?php ActiveForm::end(); ?>
-    <div >
+    <div>
     <div class="modal fade" id="document-modal" tabindex="-1" role="dialog" aria-labelledby="document-modal-title">
         <div class="modal-dialog">
             <div class="modal-content">
@@ -345,6 +303,7 @@
 
     <script>
         $(document).ready(function () {
+            
             // Load document add form popin
             $('#document-content').load('<?php echo Url::to(['document/create-from-dataset']) ?>');
 
@@ -411,19 +370,19 @@
                     data: formData
 
                 })
-                        .done(function (data) {
-                            // Add document URI and close document add form
-                            $('#yiidatasetmodel-documentsuris-documenturi-' + nbDocuments).val(data);
-                            documentUploaded = true;
-                            $('#document-modal').modal('toggle');
+                .done(function (data) {
+                        // Add document URI and close document add form
+                        $('#yiidatasetmodel-documentsuris-documenturi-' + nbDocuments).val(data);
+                        documentUploaded = true;
+                        $('#document-modal').modal('toggle');
 
-                        })
-                        .fail(function (jqXHR, textStatus) {
-                            // Disaply errors
-                            $('#document-save-msg').parent().removeClass('alert-info');
-                            $('#document-save-msg').parent().addClass('alert-danger');
-                            $('#document-save-msg').html('Request failed: ' + textStatus);
-                        });
+                })
+                .fail(function (jqXHR, textStatus) {
+                        // Disaply errors
+                        $('#document-save-msg').parent().removeClass('alert-info');
+                        $('#document-save-msg').parent().addClass('alert-danger');
+                        $('#document-save-msg').html('Request failed: ' + textStatus);
+                });
 
                 return false;
             });
@@ -458,19 +417,52 @@
             
             populateVariableList($("#experiment-selector").val());
             
-            // collapse each group
+            // Verifiy saving form step
             $('.collapse').on('show.bs.collapse', function (e) {
-                $('.collapse').not($('#'+e.target.id)).each(function(){
-                    $(this).collapse('hide');
-                });
+                var target = e.target.id;
+                var varStepString = "step-0" ;
+
+                if( e.target.id === varStepString + 2 ){
+                    if($("#experiment-selector :selected").val() === ""){
+                        e.stopPropagation();
+                        e.preventDefault();
+                        toastr.warning('You must select an experiment, in step 1');
+                    }
+                }
+                if( e.target.id === varStepString + 3 ){
+                    if($("#experiment-selector :selected").val() === ""){
+                        e.stopPropagation();
+                        e.preventDefault();
+                        toastr.warning('You must select an experiment, in step 1');
+                    }else{
+                        $("#" + varStepString + 2).collapse('hide');
+                    }
+                }
+                if( e.target.id === varStepString + 4 ){
+                    if($("#experiment-selector :selected").val() === ""){
+                        e.stopPropagation();
+                        e.preventDefault();
+                        toastr.warning('You must select an experiment, in step 1');
+                    }
+                    if($("#provenance-selector :selected").val() === ""
+                          ||  !provenances.hasOwnProperty($("#provenance-selector :selected").val())){
+                        e.stopPropagation();
+                        e.preventDefault();
+                        toastr.warning('You must select a valid provenance or save your new provenance, in step 3');
+                    }
+                }
             });
         });
         
+        /**
+         * Fill variable dropdown
+         * @param string experimentUri
+         * @returns void        */
         function populateVariableList(experimentUri){
             if(experimentUri !== undefined && experimentUri !== null ){
                 var select = $('#uriVariable-selector');
                 var settings = select.attr('data-krajee-select2'),
-                id = select.attr('id');
+
                 settings = window[settings];
 
                 $.ajax({
@@ -482,7 +474,6 @@ function populateVariableList(experimentUri){
                 .done(function (data) {
 
                     settings.data = data.data;
-                    console.log(settings);
                     select.select2(settings);
                 })
                 .fail(function (jqXHR, textStatus) {
@@ -491,5 +482,117 @@ function populateVariableList(experimentUri){
                 });
             }
         }
+        
+        /**
+         * Save provenance model via ajax
+         * @returns {Boolean}         */
+        function saveProvenance(){
+
+            var uriTest = $("#provenance-selector :selected").val();
+            
+            if(provenances.hasOwnProperty(uriTest)){
+                  toastr.info("Already existing provenance");
+            }
+            
+            if(!provenances.hasOwnProperty(uriTest) 
+                    && $("#provenance-selector :selected").val() !== undefined
+                    && $("#provenance-selector :selected").val() !== ""){
+                var provenance = {};
+                toastr.info("Saving provenance ...");
+                provenance['label']= $("#provenance-selector :selected").val();
+                provenance['comment']= $("#yiidatasetmodel-provenancecomment").val();
+                provenance['documents']= [];
+                if($("#yiidatasetmodel-documentsuris").val() !== undefined){
+                    provenance['documents']= $("#yiidatasetmodel-documentsuris").val();
+                }
+                provenance['sensingDevices']= [];
+                if($("#yiidatasetmodel-sensingDevices").val() !== undefined){
+                    provenance['sensingDevices']= $("#yiidatasetmodel-sensingDevices").val();
+                }
+                provenance['agents']= [];
+                if($("#yiidatasetmodel-provenanceagents").val() !== undefined){
+                    provenance['agents']= $("#yiidatasetmodel-provenanceagents").val();
+                }
+                console.log(provenance);
+                 $.ajax({
+                    url: 'index.php?r=dataset%2Fcreate-provenance-from-dataset',
+                    type: 'POST',
+                    datatype: 'json',
+                    data: provenance
+
+                })
+                .done(function (data) {
+                    var select = $('#provenance-selector');
+                    var settings = select.attr('data-krajee-select2'),
+                    settings = window[settings];
+                    
+                    provenances = data.provenances;
+                    console.log(provenances);
+                    settings.data = data.provenancesByUri;
+                    select.select2(settings);
+                    updateProvenanceFields(data.newProvenanceUri);
+                    console.log(provenances.hasOwnProperty(data.newProvenanceUri))
+                    toastr.success("Provenance saved");
+                })
+                .fail(function (jqXHR, textStatus) {
+                    // Disaply errors
+                    $('#document-save-msg').parent().removeClass('alert-info');
+                    $('#document-save-msg').parent().addClass('alert-danger');
+                    $('#document-save-msg').html('Request failed: ' + textStatus);
+                    toastr.error("An error has occured during provenance saving");
+                });
+
+            return false;   
+            }
+        }
+        
+        /**
+        * Function to update provenance comment field depending of selected URI
+         * @param string  provenance uri
+         * @returns {undefined}         */
+        function updateProvenanceFields(uri) {
+            if (provenances.hasOwnProperty(uri)) {
+                // If selected provenance is known get its comment
+                var comment = provenances[uri]["comment"];
+
+                // Set provenance comment, disable input and remove validation messages 
+                $("#yiidatasetmodel-provenancecomment").val(comment).attr("disabled", "disabled");
+                $(".field-yiidatasetmodel-provenancecomment, .field-yiidatasetmodel-provenancecomment *")
+                        .removeClass("has-error")
+                        .removeClass("has-success");
+                $(".field-yiidatasetmodel-provenancecomment .help-block").empty();
+
+                // Set provenance provenanceAgents, disable input and remove validation messages 
+                try {
+                    var provenanceAgents = provenances[uri]["metadata"]["prov:Agent"]["oeso:Operator"];
+                    $("#yiidatasetmodel-provenanceagents").val(provenanceAgents);
+                    $("#yiidatasetmodel-provenanceagents").trigger("change");
+                } catch (error) {
+                    $("#yiidatasetmodel-provenanceagents").val([]);
+                    $("#yiidatasetmodel-provenanceagents").trigger("change");
+                    console.log("No agents set");
+                } finally {
+                    $("#yiidatasetmodel-provenanceagents").val(agents).attr("disabled", "disabled");
+                    $(".field-yiidatasetmodel-provenanceagents, .field-yiidatasetmodel-provenanceagents *")
+                            .removeClass("has-error")
+                            .removeClass("has-success");
+                    $(".field-yiidatasetmodel-provenanceagents .help-block").empty();
+                }
+                // Load linked documents
+                $("#already-linked-documents").load(documentsLoadUri, {
+                    "uri": uri
+                })
+            } else {
+                // Otherwise clear provenance agents and enable input
+                $("#yiidatasetmodel-provenanceagents").val(agents).removeAttr("disabled").trigger("change");
+
+                // Otherwise clear provenance comment and enable input
+                $("#yiidatasetmodel-provenancecomment").val("").removeAttr("disabled");
+
+                // Clear linked documents list
+                $("#already-linked-documents").empty();
+            }
+        }
     </script>
 </div>
+</div>
\ No newline at end of file

From acb9f5b2f4c11c7d3f814b7fb2f1e01e3775656c Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Tue, 26 Nov 2019 17:46:06 +0100
Subject: [PATCH 23/35] Update dataset controller

---
 controllers/DatasetController.php             | 50 ++-----------------
 views/dataset/_form.php                       |  8 +--
 views/dataset/create.php                      |  2 +-
 .../DatasetFiles/coma/datasetTemplate.csv     |  2 +-
 4 files changed, 9 insertions(+), 53 deletions(-)

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index 6d9f643d..607fce7b 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -26,7 +26,6 @@
 use openSILEX\handsontablePHP\adapter\HandsontableSimple;
 use openSILEX\handsontablePHP\classes\ColumnConfig;
 use app\models\wsModels\WSConstants;
-use app\components\helpers\Vocabulary;
 use app\models\yiiModels\YiiExperimentModel;
 
 require_once '../config/config.php';
@@ -410,45 +409,17 @@ public function actionCreate() {
             $variablesNotInExperiment = array_diff($csvVariables, array_values($experimentVariables)); 
             // Check CSV header with variables
             if (count($variablesNotInExperiment) === 0) {
-                // Get selected or create Provenance URI
-//                if (!array_key_exists($datasetModel->provenanceUri, $provenances)) {
-//                    $provenanceUri = $this->createProvenance(
-//                            $datasetModel->provenanceUri,
-//                            $datasetModel->provenanceComment,
-//                            $datasetModel->provenanceSensingDevices,
-//                            $datasetModel->provenanceAgents
-//                    );
-//                    $datasetModel->provenanceUri = $provenanceUri;
-//                    $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
-//                    $this->view->params["provenances"] = $provenances;
-//                } else {
                     $provenanceUri = $datasetModel->provenanceUri;
-//                }
-
-                // If provenance sucessfully created
-                if ($provenanceUri) {
-                    // Link uploaded documents to provenance URI
-//                    $linkDocuments = true;
-//                    if (is_array($datasetModel->documentsURIs) && is_array($datasetModel->documentsURIs["documentURI"])) {
-//                        $linkDocuments = $this->linkDocumentsToProvenance(
-//                                $provenanceUri,
-//                                $datasetModel->documentsURIs["documentURI"]
-//                        );
-//                    }
-                    // Load all objectsl inked to an experiment
-                    
                     $SciencitificObjectSearch = new \app\models\yiiModels\ScientificObjectSearch();
                     $SciencitificObjectSearch->experiment = $datasetModel->experiment;
                     $SciencitificObjectSearch->pageSize = 30000;
-                    $result = $SciencitificObjectSearch->search($token);
+                    $SciencitificObjectSearchResults = $SciencitificObjectSearch->search($token);
 
                     $objectUris = [];
-                    foreach ($result->getModels() as $object){
+                    foreach ($SciencitificObjectSearchResults->getModels() as $object){
                         $objectUris[$object->uri]=$object->label;
                     }
                     $datasetModel->documentsURIs = null;
-
-                    if ($linkDocuments === true) {
                         $objectsErrors = [];
                         // Save CSV data linked to provenance URI
                         $values = [];
@@ -500,22 +471,7 @@ public function actionCreate() {
                                         'errors' => $result->metadata->status
                             ]);
                         }
-                    } else {
-                        return $this->render('create', [
-                                    'model' => $datasetModel,
-                                    'errors' => [
-                                        Yii::t("app/messages", "Error while creating linked documents")
-                                    ]
-                        ]);
-                    }
-                } else {
-                    return $this->render('create', [
-                                'model' => $datasetModel,
-                                'errors' => [
-                                    Yii::t("app/messages", "Error while creating provenance")
-                                ]
-                    ]);
-                }
+                
             } else {
                 return $this->render('create', [
                             'model' => $datasetModel,
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index 12365c08..bfc0d1b6 100644
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -82,9 +82,9 @@
 
         <h3 class="alert alert-info" style="margin:3%;">Add dataset form</h3>
 <?php endif; ?>
-    <h3><i>  <?= Yii::t('app', 'Steps to insert your dataset') ?></i></h3>
+    <h3><i>  <?= Yii::t('app', 'Steps :') ?></i></h3>
   <h3><i> <a data-toggle="collapse" href="#step-01" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
-             <?= "1. " . Yii::t('app', 'Choose the experiment from where the dataset comes from') ?> <span style="color:red"> *</span></a></i></h3>
+             <?= "1. " . Yii::t('app', 'Select associated experiment') ?> </a></i></h3>
     <div class="collapse" id="step-01" data-step="1">
         <?=
         $form->field($model, 'experiment')->widget(\kartik\select2\Select2::classname(), [
@@ -176,7 +176,7 @@
         </div>
     </div>
       <h3><i> <a data-toggle="collapse" href="#step-03" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
-             <?= "3. " . Yii::t('app', 'Select or create a source that describes how the dataset was obtained') ?><span style="color:red"> *</span> </a></i></h3>
+             <?= "3. " . Yii::t('app', 'Select or create a description that describes how the dataset was produced') ?> </a></i></h3>
     <div class="collapse" id="step-03" data-step="3">
     <h4><?= Yii::t('app', 'Provenance'); ?></h4>
     <p class="alert alert-info"><?= Yii::t('app/messages', 'To create a new provenance, write the provenance label in the research field and press `Enter`'); ?></p>
@@ -263,7 +263,7 @@
 
     </div>
     <h3><i> <a data-toggle="collapse" href="#step-04" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
-             <?= "4. " . Yii::t('app', 'Save your dataset.') ?> </a></i></h3>
+             <?= "4. " . Yii::t('app', 'Upload dataset') ?> </a></i></h3>
     <div class="collapse" id="step-04" data-step="4">
     <hr style="border-color:gray;"/>    
     <h3><i>  <?= Yii::t('app', 'Dataset input file') ?></i></h3>
diff --git a/views/dataset/create.php b/views/dataset/create.php
index ba9d5592..6b79a8d5 100644
--- a/views/dataset/create.php
+++ b/views/dataset/create.php
@@ -19,7 +19,7 @@
 /* @var $handsontable openSILEX\handsontablePHP\adapter\HandsontableSimple */
 /* @var $handsontableErrorsCellsSettings string */
 
-$this->title = Yii::t('app', 'Add Dataset');
+$this->title = Yii::t('app', 'Add Dataset on scientific object');
 //$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Dataset', ['n' => 2]), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
diff --git a/web/documents/DatasetFiles/coma/datasetTemplate.csv b/web/documents/DatasetFiles/coma/datasetTemplate.csv
index cee1bbd3..5ddeb877 100755
--- a/web/documents/DatasetFiles/coma/datasetTemplate.csv
+++ b/web/documents/DatasetFiles/coma/datasetTemplate.csv
@@ -1 +1 @@
-ScientificObjectAlias,Date,Variable value
+ScientificObjectAlias,Date

From be989cd48ece6166e455333e429260bde64d755b Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Mon, 2 Dec 2019 14:46:45 +0100
Subject: [PATCH 24/35] Update dataset with vue.js

---
 composer.json                         |   3 +-
 composer.lock                         | 116 +++-
 controllers/DatasetController.php     |  35 +-
 models/wsModels/WSProvenanceModel.php |   4 +-
 views/dataset/_form.php               | 781 +++++++++++++++-----------
 5 files changed, 604 insertions(+), 335 deletions(-)

diff --git a/composer.json b/composer.json
index 8b4b565b..abee2773 100755
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,8 @@
         "fortawesome/font-awesome": "v4.7.0",
         "opensilex/opencpu-client-php": "dev-master",
         "himiklab/yii2-handsontable-widget" : "v1.1.1",
-        "phayes/geophp": "1.2"
+        "phayes/geophp": "1.2",
+        "antkaz/yii2-vue": "^1.0"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "2.0.14",
diff --git a/composer.lock b/composer.lock
index 5b1dfd05..76d673e7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,9 +4,51 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a81ff6872bbd8b0fdf3f387ebc99092a",
-    "content-hash": "05c766297ee7a05e6c5a1c1b8da57159",
+    "content-hash": "c1a3ce2e444177eef1da5e0ce5a3cb00",
     "packages": [
+        {
+            "name": "antkaz/yii2-vue",
+            "version": "v1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/antkaz/yii2-vue.git",
+                "reference": "ba341bdbcfffa96662f49fe83152a867191d3b72"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/antkaz/yii2-vue/zipball/ba341bdbcfffa96662f49fe83152a867191d3b72",
+                "reference": "ba341bdbcfffa96662f49fe83152a867191d3b72",
+                "shasum": ""
+            },
+            "require": {
+                "npm-asset/vue": "~2.5.13",
+                "yiisoft/yii2": "~2.0.14"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "antkaz\\vue\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Anton Kazarinov",
+                    "email": "askazarinov@gmail.com"
+                }
+            ],
+            "description": "The Vue.js extension for the Yii framework",
+            "homepage": "https://github.com/antkaz/yii2-vue",
+            "keywords": [
+                "Vue.js",
+                "vue",
+                "yii2"
+            ],
+            "time": "2018-03-01T19:37:33+00:00"
+        },
         {
             "name": "borales/yii2-phone-input",
             "version": "0.1.2",
@@ -2213,6 +2255,76 @@
             ],
             "time": "2019-01-21T22:06:44+00:00"
         },
+        {
+            "name": "npm-asset/vue",
+            "version": "2.5.22",
+            "dist": {
+                "type": "tar",
+                "url": "https://registry.npmjs.org/vue/-/vue-2.5.22.tgz",
+                "shasum": "3bf88041af08b8539c37b268b70ca79245e9cc30"
+            },
+            "type": "npm-asset-library",
+            "extra": {
+                "npm-asset-bugs": {
+                    "url": "https://github.com/vuejs/vue/issues"
+                },
+                "npm-asset-main": "dist/vue.runtime.common.js",
+                "npm-asset-directories": [],
+                "npm-asset-repository": {
+                    "type": "git",
+                    "url": "git+https://github.com/vuejs/vue.git"
+                },
+                "npm-asset-scripts": {
+                    "dev": "rollup -w -c scripts/config.js --environment TARGET:web-full-dev",
+                    "dev:cjs": "rollup -w -c scripts/config.js --environment TARGET:web-runtime-cjs",
+                    "dev:esm": "rollup -w -c scripts/config.js --environment TARGET:web-runtime-esm",
+                    "dev:test": "karma start test/unit/karma.dev.config.js",
+                    "dev:ssr": "rollup -w -c scripts/config.js --environment TARGET:web-server-renderer",
+                    "dev:compiler": "rollup -w -c scripts/config.js --environment TARGET:web-compiler ",
+                    "dev:weex": "rollup -w -c scripts/config.js --environment TARGET:weex-framework",
+                    "dev:weex:factory": "rollup -w -c scripts/config.js --environment TARGET:weex-factory",
+                    "dev:weex:compiler": "rollup -w -c scripts/config.js --environment TARGET:weex-compiler ",
+                    "build": "node scripts/build.js",
+                    "build:ssr": "npm run build -- web-runtime-cjs,web-server-renderer",
+                    "build:weex": "npm run build -- weex",
+                    "test": "npm run lint && flow check && npm run test:types && npm run test:cover && npm run test:e2e -- --env phantomjs && npm run test:ssr && npm run test:weex",
+                    "test:unit": "karma start test/unit/karma.unit.config.js",
+                    "test:cover": "karma start test/unit/karma.cover.config.js",
+                    "test:e2e": "npm run build -- web-full-prod,web-server-basic-renderer && node test/e2e/runner.js",
+                    "test:weex": "npm run build:weex && jasmine JASMINE_CONFIG_PATH=test/weex/jasmine.js",
+                    "test:ssr": "npm run build:ssr && jasmine JASMINE_CONFIG_PATH=test/ssr/jasmine.js",
+                    "test:sauce": "npm run sauce -- 0 && npm run sauce -- 1 && npm run sauce -- 2",
+                    "test:types": "tsc -p ./types/test/tsconfig.json",
+                    "lint": "eslint src scripts test",
+                    "flow": "flow check",
+                    "sauce": "karma start test/unit/karma.sauce.config.js",
+                    "bench:ssr": "npm run build:ssr && node benchmarks/ssr/renderToString.js && node benchmarks/ssr/renderToStream.js",
+                    "release": "bash scripts/release.sh",
+                    "release:weex": "bash scripts/release-weex.sh",
+                    "release:note": "node scripts/gen-release-note.js",
+                    "commit": "git-cz"
+                },
+                "npm-asset-config": {
+                    "commitizen": {
+                        "path": "./node_modules/cz-conventional-changelog"
+                    }
+                }
+            },
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Evan You"
+                }
+            ],
+            "description": "Reactive, component-oriented view layer for modern web interfaces.",
+            "homepage": "https://github.com/vuejs/vue#readme",
+            "keywords": [
+                "vue"
+            ],
+            "time": "2019-01-11T23:18:40+00:00"
+        },
         {
             "name": "oomphinc/composer-installers-extender",
             "version": "v1.1.2",
diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index 607fce7b..0344f95d 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -143,12 +143,16 @@ public function actionGenerateAndDownloadDatasetCreationFile() {
      * @param type $experimentUri
      */
     public function actionCreateProvenanceFromDataset(){
-        $token = Yii::$app->session[WSConstants::ACCESS_TOKEN];
 
         Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
-        $provenance = Yii::$app->request->post();
-
-        $provenanceService = new WSProvenanceModel();
+        $data = Yii::$app->request->post();
+        
+        $documents = [];
+        
+        $provenance = $data["provenance"];
+        if(isset($data["documents"])){
+            $documents = $data["documents"];
+        }
         $provenanceUri = $this->createProvenance(
                             $provenance['label'],
                             $provenance['comment'],
@@ -156,10 +160,23 @@ public function actionCreateProvenanceFromDataset(){
                             $provenance['agents']
                     );
         
+        $this->linkDocumentsToProvenance($provenanceUri, $documents);
+        
+        if($provenanceUri != false){
+            return $provenanceUri;
+        }
+        return false;
+    }
+    
+    public function actionGetProvenancesSelectList(){
+        $token = Yii::$app->session[WSConstants::ACCESS_TOKEN];
+
+        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $provenanceService = new WSProvenanceModel();
+
+        $provenances= [];
         $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
-        $result = [];
-        $provenancesArray =[];
-        $result['newProvenanceUri'] = $provenanceUri;
+        
         foreach ($provenances as $uri => $provenance) {
             $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
         }
@@ -499,9 +516,10 @@ public function actionCreate() {
     private function createProvenance($alias, $comment,$sensingDevice = null, $agent =null) {
         $provenanceService = new WSProvenanceModel();
         $date = new \DateTime();
+        $createdDate = $date->format("Y-m-d\TH:i:sO");
         $metadata = [
             "namespaces" => Yii::$app->params[self::PROVENANCE_PARAMS_VALUES],
-            "creationDate" => $date->format("Y-m-d\TH:i:sO"),
+            "created" => $date->format("Y-m-d\TH:i:sO"),
             "prov:Agent" =>[
                 "oeso:SensingDevice" => [
                 ],
@@ -519,6 +537,7 @@ private function createProvenance($alias, $comment,$sensingDevice = null, $agent
                 Yii::$app->session['access_token'],
                 $alias,
                 $comment,
+                $createdDate,
                 $metadata
         );
 
diff --git a/models/wsModels/WSProvenanceModel.php b/models/wsModels/WSProvenanceModel.php
index 5d06a79e..fafc413b 100644
--- a/models/wsModels/WSProvenanceModel.php
+++ b/models/wsModels/WSProvenanceModel.php
@@ -34,14 +34,16 @@ public function __construct() {
      * @param type $sessionToken
      * @param type $label
      * @param type $comment
+     * @param type $createdDate Description
      * @param type $metadata
      * @return type
      */
-    public function createProvenance($sessionToken, $label, $comment, $metadata) {
+    public function createProvenance($sessionToken, $label, $comment,$createdDate, $metadata) {
         $subService = "/";
         $provenance = $this->post($sessionToken, $subService, [[
         "label" => $label,
         "comment" => $comment,
+        "created" => $createdDate,
         "metadata" => $metadata,
         ]]);
 
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index bfc0d1b6..604a1712 100644
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -29,8 +29,214 @@
     echo $handsontable->loadJSLibraries(true);
     echo $handsontable->loadCSSLibraries();
 }
+use antkaz\vue\VueAsset;
+VueAsset::register($this);
+$this->registerJsFile("https://rawgit.com/cristijora/vue-form-wizard/master/dist/vue-form-wizard.js");
+$this->registerCssFile("https://rawgit.com/cristijora/vue-form-wizard/master/dist/vue-form-wizard.min.css");
+$this->registerCssFile("https://rawgit.com/lykmapipo/themify-icons/master/css/themify-icons.css");
 ?>
+ <script>
+            
+        /**
+         * Fill variable dropdown
+         * @param string experimentUri
+         * @returns void        */
+        function populateVariableList(experimentUri){
+            var select = $('#uriVariable-selector');
+            var settings = select.attr('data-krajee-select2'),
+            settings = window[settings];
+            if(experimentUri !== undefined && experimentUri !== null ){
+                $.ajax({
+                    url: '<?= Url::toRoute(['dataset/get-experiment-mesured-variables-select-list']); ?>',
+                    type: 'GET',
+                    dataType: 'json',
+                    data: {"experimentUri": experimentUri}
+                })
+                .done(function (data) {
+                    select.html("");
+                    console.log(data)
+                    if(data.data.length === 0){
+                        settings.data = {};
+                        select.val('').change();
+                    }else{
+                        settings.data = data.data;
+                        select.select2(settings).change();
+                    }
+                    
+                    
+                })
+                .fail(function (jqXHR, textStatus) {
+                    // Disaply errors
+                    console.log(jqXHR)
+                });
+            }else{
+                select.val('').change();
+                select.html("");
+            }
+        }
+        
+        /**
+         * Save provenance model via ajax
+         * @returns {Boolean}         */
+        function saveProvenance(){
+
+            var newProvenanceUri = $("#provenance-selector :selected").val();
+            
+            if(provenances.hasOwnProperty(newProvenanceUri)){
+                  toastr.info("Already existing provenance");
+            }
+            
+            if(!provenances.hasOwnProperty(newProvenanceUri) 
+                    && $("#provenance-selector :selected").val() !== undefined
+                    && $("#provenance-selector :selected").val() !== ""){
+                var provenance = {};
+                toastr.info("Saving provenance ...");
+                provenance['label']= $("#provenance-selector :selected").val();
+                provenance['comment']= $("#yiidatasetmodel-provenancecomment").val();
+                provenance['documents']= [];
+                if($("#yiidatasetmodel-documentsuris").val() !== undefined){
+                    provenance['documents']= $("#yiidatasetmodel-documentsuris").val();
+                }
+                provenance['sensingDevices']= [];
+                if($("#yiidatasetmodel-sensingDevices").val() !== undefined){
+                    provenance['sensingDevices']= $("#yiidatasetmodel-sensingDevices").val();
+                }
+                provenance['agents']= [];
+                if($("#yiidatasetmodel-provenanceagents").val() !== undefined){
+                    provenance['agents']= $("#yiidatasetmodel-provenanceagents").val();
+                }
+                var documents = [];
+                var documentsInputList = $("input[id^='yiidatasetmodel-documentsuris-documenturi-']")
+                documentsInputList.each(function (i, documentInput) {
+                    documents.push($(documentInput).val());
+                });
+                
+                 $.ajax({
+                    url: 'index.php?r=dataset%2Fcreate-provenance-from-dataset',
+                    type: 'POST',
+                    datatype: 'json',
+                    data: {provenance :provenance,
+                            documents : documents}
+                })
+                .done(function (newProvenanceUri) {
+                    if(newProvenanceUri !== false){
+                        loadProvenances(newProvenanceUri)
+                        .done(function (data) {
+                            var select = $('#provenance-selector');
+                            var settings = select.attr('data-krajee-select2'),
+                            settings = window[settings];
+                            provenances = data.provenances;
+                            settings.data = data.provenancesByUri;
+                            select.select2(settings);
+                            updateProvenanceFields(newProvenanceUri);
+                            if(newProvenanceUri !== undefined && newProvenanceUri !== null){
+                                var $newOption = $("<option selected='selected'></option>").val(newProvenanceUri).text(data.provenancesByUri[newProvenanceUri])
+                                select.append($newOption).trigger('change');
+                            }
+                            toastr.success("Provenance saved");
+                        }).fail(function (jqXHR, textStatus) {
+                                // Disaply errors
+                                $('#document-save-msg').parent().removeClass('alert-info');
+                                $('#document-save-msg').parent().addClass('alert-danger');
+                                $('#document-save-msg').html('Request failed: ' + textStatus);
+                                toastr.error("An error has occured during provenance saving");
+                        });
+                    }else{
+                        $('#document-save-msg').parent().removeClass('alert-info');
+                        $('#document-save-msg').parent().addClass('alert-danger');
+                        $('#document-save-msg').html('Request failed: ' + textStatus);
+                        toastr.error("An error has occured during provenance saving"); 
+                    }
+                   
+                })
+                .fail(function (jqXHR, textStatus) {
+                    // Disaply errors
+                    $('#document-save-msg').parent().removeClass('alert-info');
+                    $('#document-save-msg').parent().addClass('alert-danger');
+                    $('#document-save-msg').html('Request failed: ' + textStatus);
+                    toastr.error("An error has occured during provenance saving");
+                });
+
+            return false;   
+            }
+        }
+        
+        
+        function loadProvenances(provenanceSelectedUri){
+            return $.ajax({
+                    url: 'index.php?r=dataset%2Fget-provenances-select-list',
+                    type: 'POST',
+                    datatype: 'json'
+            });
+        }
+        
+        /**
+        * Function to update provenance comment field depending of selected URI
+         * @param string  provenance uri
+         * @returns {undefined}         */
+        function updateProvenanceFields(uri) {
+            if (provenances.hasOwnProperty(uri)) {
+                // If selected provenance is known get its comment
+                var comment = provenances[uri]["comment"];
+
+                // Set provenance comment, disable input and remove validation messages 
+                $("#yiidatasetmodel-provenancecomment").val(comment).attr("disabled", "disabled");
+                $(".field-yiidatasetmodel-provenancecomment, .field-yiidatasetmodel-provenancecomment *")
+                        .removeClass("has-error")
+                        .removeClass("has-success");
+                $(".field-yiidatasetmodel-provenancecomment .help-block").empty();
+
+                // Set provenance provenanceAgents, disable input and remove validation messages 
+                try {
+                    var provenanceAgents = provenances[uri]["metadata"]["prov:Agent"]["oeso:Operator"];
+                    $("#yiidatasetmodel-provenanceagents").val(provenanceAgents);
+                    $("#yiidatasetmodel-provenanceagents").trigger("change");
+                } catch (error) {
+                    $("#yiidatasetmodel-provenanceagents").val([]);
+                    $("#yiidatasetmodel-provenanceagents").trigger("change");
+                    console.log("No agents set");
+                } finally {
+                    $("#yiidatasetmodel-provenanceagents").val(agents).attr("disabled", "disabled");
+                    $(".field-yiidatasetmodel-provenanceagents, .field-yiidatasetmodel-provenanceagents *")
+                            .removeClass("has-error")
+                            .removeClass("has-success");
+                    $(".field-yiidatasetmodel-provenanceagents .help-block").empty();
+                }
+                // Load linked documents
+                $("#already-linked-documents").load(documentsLoadUri, {
+                    "uri": uri
+                });
+            } else {
+                // Otherwise clear provenance agents and enable input
+                $("#yiidatasetmodel-provenanceagents").val(agents).removeAttr("disabled").trigger("change");
+
+                // Otherwise clear provenance comment and enable input
+                $("#yiidatasetmodel-provenancecomment").val("").removeAttr("disabled");
+
+                // Clear linked documents list
+                $("#already-linked-documents").empty();
+            }
+        }
+    </script>
+        <script>
+    $(document).ready(function () {
+        <?php
+        // Create Provenance select value<div class="collapse" id="collapseExample">s array
+        foreach ($this->params['provenances'] as $uri => $provenance) {
+            $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
+        }
+        // Inject URI to get document widget linked to an URI
+        echo 'documentsLoadUri = "' . Url::to(['document/get-documents-widget']) . '";';
+        // Inject provenances list indexed by URI
+        echo 'provenances = ' . json_encode($this->params['provenances']) . ';';
+        // Inject sensingDevices list indexed by URI
+        echo 'sensingDevices = ' . json_encode($this->params['sensingDevices']) . ';';
+        // Inject agents list indexed by URI
+        echo 'agents = ' . json_encode($this->params['agents']) . ';';
+        ?>
 
+    });
+    </script>
 <div class="dataset-form well">
     <?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]); ?>
 
@@ -82,38 +288,48 @@
 
         <h3 class="alert alert-info" style="margin:3%;">Add dataset form</h3>
 <?php endif; ?>
-    <h3><i>  <?= Yii::t('app', 'Steps :') ?></i></h3>
-  <h3><i> <a data-toggle="collapse" href="#step-01" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
-             <?= "1. " . Yii::t('app', 'Select associated experiment') ?> </a></i></h3>
-    <div class="collapse" id="step-01" data-step="1">
-        <?=
-        $form->field($model, 'experiment')->widget(\kartik\select2\Select2::classname(), [
-            'data' => $this->params['experiments'],
-            'options' => [
-                'placeholder' => Yii::t('app/messages', 'Select one experiment') . ' ...',
-                'id' => 'experiment-selector',
-                'multiple' => false
-            ],
-            'pluginOptions' => [
-                'allowClear' => true,
-                'tags' => true
-            ],  
-            'pluginEvents' => [
-                'select2:select' => 'function(e) { populateVariableList(e.params.data.id); }',
-            ]
-        ]);
-        ?>
-    </div>
-  
-    <h3><i> <a data-toggle="collapse" href="#step-02" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
-             <?= "2. " . Yii::t('app', 'Do you want to generate a dataset template ?') ?> </a></i></h3>
-    <div class="collapse" id="step-02" data-step="2">
-    <hr>
-    <hr style="border-color:gray;"/>
-    <h3><i>  <?= Yii::t('app', 'Dataset template generation') ?></i></h3>
-    <p class="alert alert-info"><?= Yii::t('app/messages', 'The variables below are associated to the choosen experiment'); ?></p>
+        <div id="app">
+            <div>
+                <template>
+                <form-wizard @on-complete="onComplete"
+                             @on-validate="handleValidation"
+                             @on-loading="setLoading"
+                              shape="square"
+                              color="#3498db"
+                              back-button-text="<?= Yii::t('app/messages','Back') ?>"
+                              next-button-text="<?= Yii::t('app/messages','Next') ?>"
+                              finish-button-text="<?= Yii::t('yii', 'Upload dataset') ?>"
+                              >
+                    <div class="loader" v-if="loadingWizard"></div>
+                    <tab-content title="Choose experiment"
+                                 icon="ti-user" 
+                                 :before-change="beforeSelectProvenance">
+    <?=
+    $form->field($model, 'experiment')->widget(\kartik\select2\Select2::classname(), [
+        'data' => $this->params['experiments'],
+        'options' => [
+            'placeholder' => Yii::t('app/messages', 'Select one experiment') . ' ...',
+            'id' => 'experiment-selector',
+            'multiple' => false
+        ],
+        'pluginOptions' => [
+            'allowClear' => true,
+            'tags' => true
+        ],  
+        'pluginEvents' => [
+            'select2:select' => 'function(e) { populateVariableList(e.params.data.id); }',
+        ]
+    ]);
+    ?>
+            </tab-content>
+            <tab-content title="Generate dataset template (optional)"
+                                         icon="ti-user" 
+                                         :before-change="beforeSelectProvenance">
+            <hr style="border-color:gray;"/>
+            <h3><i>  <?= Yii::t('app', 'Need a dataset template ? (Optional)') ?></i></h3>
+            <p class="alert alert-info"><?= Yii::t('app/messages', 'The variables below are associated to the choosen experiment'); ?></p>
     <?php
-    $select2VariablesOptions =  [
+        $select2VariablesOptions =  [
             'placeholder' => Yii::t('app/messages', 'Select one or many experiment associated variables') . ' ...',
             'id' => 'uriVariable-selector',
             'multiple' => true
@@ -121,92 +337,69 @@
     ?>
     
     <?=
-    $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(), [
-        'data' => [],
-        'options' => $select2VariablesOptions,
-        'pluginOptions' => [
-            'allowClear' => true,
-            'tags' => true
-        ],
-    ]);
+        $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(), [
+            'data' => [],
+            'options' => $select2VariablesOptions,
+            'pluginOptions' => [
+                'allowClear' => true,
+                'tags' => false
+            ],
+        ]);
     ?>
     <p>
-<?php
-$csvPath = "coma";
-if (Yii::$app->params['csvSeparator'] == ";") {
-    $csvPath = "semicolon";
-}
-?>
+    <?php
+        $csvPath = "coma";
+        if (Yii::$app->params['csvSeparator'] == ";") {
+            $csvPath = "semicolon";
+        }
+    ?>
     <i>
-    <?= 
-        Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download generated template'),
+    
+                </i>
+                </p>
+
+                <hr>
+                <hr style="border-color:gray;"/>
+                <i style="float: right"><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Example'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetExemple.csv') ?></i>
+                    <br>
+                    <div class="alert alert-info" role="alert">
+                        <b><?= Yii::t('app/messages', 'File Rules') ?> : </b>
+                        <ul>
+                            <li><?= Yii::t('app/messages', 'CSV separator must be') ?> "<b><?= Yii::$app->params['csvSeparator'] ?></b>"</li>
+                            <li><?= Yii::t('app/messages', 'Decimal separator for numeric values must be') ?> "<b>.</b>"</li>
+                        </ul>
+                        <br/>
+                        <b><?= Yii::t('app', 'Columns') ?> : </b>
+                        <table class="table table-hover" id="dataset-csv-columns-desc">
+                            <tr>
+                                <th style="color:red">ScientificObjectAlias *</th>
+                                <td><?= Yii::t('app/messages', 'The ALIAS of the scientific object for the choosen experiment (e.g MTP_WW_2019_P050_SH1_2018_LF14)') ?></td>
+                            </tr>
+                            <tr>
+                                <th style="color:red">Date *</th>
+                                <td><p><?= Yii::t('app/messages', 'Acquisition date of the data') ?> (format ISO 8601: YYYY-MM-DD or YYYY-MM-DDTHH:mm:ssZ) </p> </td>
+                            </tr>
+                            <tr class="dataset-variables">
+                                <th style="color:red">Variable value *</th>
+                                <td ><?= Yii::t('app', 'Variable value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)</td>
+                            </tr>
+                        </table>
+                    </div>               
+                    
+                    <?= 
+        Html::a("<button type='button' class='btn btn-info'> " . Yii::t('app', 'Download generated template') . "</button>",
             \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetTemplate.csv',
             ['id' => 'downloadDatasetTemplate']
         );
     ?>
-    </i>
-    </p>
-   
-    <hr>
-    <hr style="border-color:gray;"/>
-    <i style="float: right"><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Example'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetExemple.csv') ?></i>
-        <br>
-        <div class="alert alert-info" role="alert">
-            <b><?= Yii::t('app/messages', 'File Rules') ?> : </b>
-            <ul>
-                <li><?= Yii::t('app/messages', 'CSV separator must be') ?> "<b><?= Yii::$app->params['csvSeparator'] ?></b>"</li>
-                <li><?= Yii::t('app/messages', 'Decimal separator for numeric values must be') ?> "<b>.</b>"</li>
-            </ul>
-            <br/>
-            <b><?= Yii::t('app', 'Columns') ?> : </b>
-            <table class="table table-hover" id="dataset-csv-columns-desc">
-                <tr>
-                    <th style="color:red">ScientificObjectAlias *</th>
-                    <td><?= Yii::t('app/messages', 'The ALIAS of the scientific object for the choosen experiment (e.g MTP_WW_2019_P050_SH1_2018_LF14)') ?></td>
-                </tr>
-                <tr>
-                    <th style="color:red">Date *</th>
-                    <td><p><?= Yii::t('app/messages', 'Acquisition date of the data') ?> (format ISO 8601: YYYY-MM-DD or YYYY-MM-DDTHH:mm:ssZ) </p> </td>
-                </tr>
-                <tr class="dataset-variables">
-                    <th style="color:red">Variable value *</th>
-                    <td ><?= Yii::t('app', 'Variable value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)</td>
-                </tr>
-            </table>
-        </div>
-    </div>
-      <h3><i> <a data-toggle="collapse" href="#step-03" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
-             <?= "3. " . Yii::t('app', 'Select or create a description that describes how the dataset was produced') ?> </a></i></h3>
-    <div class="collapse" id="step-03" data-step="3">
-    <h4><?= Yii::t('app', 'Provenance'); ?></h4>
-    <p class="alert alert-info"><?= Yii::t('app/messages', 'To create a new provenance, write the provenance label in the research field and press `Enter`'); ?></p>
-    <script>
-    $(document).ready(function () {
-<?php
-// Create Provenance select value<div class="collapse" id="collapseExample">s array
-foreach ($this->params['provenances'] as $uri => $provenance) {
-    $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
-}
-// Inject URI to get document widget linked to an URI
-echo 'documentsLoadUri = "' . Url::to(['document/get-documents-widget']) . '";';
-// Inject provenances list indexed by URI
-echo 'provenances = ' . json_encode($this->params['provenances']) . ';';
-// Inject sensingDevices list indexed by URI
-echo 'sensingDevices = ' . json_encode($this->params['sensingDevices']) . ';';
-// Inject agents list indexed by URI
-echo 'agents = ' . json_encode($this->params['agents']) . ';';
-?>
-
-        // On provenance change update provenance fields
-        $("#provenance-selector").change(function () {
-            updateProvenanceFields($(this).val());
-        });
-
-        // Update provenance fields depending of startup value
-        updateProvenanceFields($("#provenance-selector").val());
-
-    });
-    </script>
+                    <br><br>
+                </tab-content>
+                <tab-content title="Select or create a description that describes how the dataset was produced"
+                                 icon="ti-settings"
+                                 :before-change="beforeUploadDataset">
+                       <h4><?= Yii::t('app', 'Provenance'); ?></h4>
+                <p class="alert alert-info"><?= Yii::t('app/messages', 'To create a new provenance, write the provenance label in the research field and press `Enter`'); ?></p>
+    
     <?=
     $form->field($model, 'provenanceUri')->widget(\kartik\select2\Select2::classname(), [
         'data' => $provenancesArray,
@@ -237,8 +430,8 @@
 
     <?= $form->field($model, 'provenanceComment')->textarea(['rows' => 6]) ?>
 
-    <h3><?= Yii::t('app', 'Linked Document(s)') ?></h3>
-    <div id="already-linked-documents"></div>
+            <h3><?= Yii::t('app', 'Linked Document(s)') ?></h3>
+            <div id="already-linked-documents"></div>
     <?=
     $form->field($model, 'documentsURIs')->widget(MultipleInput::className(), [
         'max' => 6,
@@ -255,55 +448,111 @@
         ],
         'addButtonOptions' => [
             'class' => 'btn btn-primary buttonDocuments',
-            'label' => Yii::t('app', 'Add Document')
+            'label' => Yii::t('app', 'Add Document'),            
         ],
     ])->label(false)
     ?>
     <?= Html::button(Yii::t('yii', 'Save provenance'), ['class' => 'btn btn-success','onclick' => 'saveProvenance()']) ?>
 
-    </div>
-    <h3><i> <a data-toggle="collapse" href="#step-04" role="button" aria-expanded="false" aria-controls="collapseDataSetRules">
-             <?= "4. " . Yii::t('app', 'Upload dataset') ?> </a></i></h3>
-    <div class="collapse" id="step-04" data-step="4">
-    <hr style="border-color:gray;"/>    
-    <h3><i>  <?= Yii::t('app', 'Dataset input file') ?></i></h3>
+                    </tab-content>
+                    <tab-content title="Upload dataset"
+                                 icon="ti-check">
+                    <h3><i>  <?= Yii::t('app', 'Dataset input file') ?></i></h3>
 
-    <?=
-    $form->field($model, 'file')->widget(FileInput::classname(), [
-        'options' => [
-            'maxFileSize' => 2000,
-            'pluginOptions' => ['allowedFileExtensions' => ['csv'], 'showUpload' => false],
-        ]
-    ]);
-    ?>
-
-    <div class="form-group">
-    <?= Html::submitButton(Yii::t('yii', 'Save dataset'), ['class' => 'btn btn-success']) ?>
-    </div>
-    </div>
-<?php ActiveForm::end(); ?>
-    <div>
-    <div class="modal fade" id="document-modal" tabindex="-1" role="dialog" aria-labelledby="document-modal-title">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    <h4 class="modal-title" id="document-modal-title"><?php echo Html::encode(Yii::t('app', 'Create Document')); ?></h4>
-                </div>
-                <div class="modal-body">
-                    <div id="document-content"></div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-success" id="document-save"><?php echo Html::encode(Yii::t('yii', 'Create')) ?></button>
-                    <button type="button" class="btn btn-default modal-close" data-dismiss="modal"><?php echo Html::encode(Yii::t('yii', 'Close')) ?></button>
+            <?=
+            $form->field($model, 'file')->widget(FileInput::classname(), [
+                'options' => [
+                    'maxFileSize' => 2000,
+                    'pluginOptions' => ['allowedFileExtensions' => ['csv'], 'showUpload' => false],
+                ]
+            ]);
+            ?>
+
+                        <div class="form-group">
+            <?php // Html::submitButton(Yii::t('yii', 'Save dataset'), ['class' => 'btn btn-success']) ?>
+                        </div>
+                        </div>
+        <?php ActiveForm::end(); ?>
+                    </tab-content>
+                </form-wizard>
+                    <div class="modal fade" id="document-modal" tabindex="-1" role="dialog" aria-labelledby="document-modal-title">
+                    <div class="modal-dialog">
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                                <h4 class="modal-title" id="document-modal-title"><?php echo Html::encode(Yii::t('app', 'Create Document')); ?></h4>
+                            </div>
+                            <div class="modal-body">
+                                <div id="document-content"></div>
+                            </div>
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-success" id="document-save"><?php echo Html::encode(Yii::t('yii', 'Create')) ?></button>
+                                <button type="button" class="btn btn-default modal-close" data-dismiss="modal"><?php echo Html::encode(Yii::t('yii', 'Close')) ?></button>
+                            </div>
+                        </div>
+                    </div>
                 </div>
+            </template>
             </div>
-        </div>
+        </div>     
+        
+        
     </div>
-
+  
+   
+    
+    <div>
+    
+       
     <script>
         $(document).ready(function () {
-            
+             Vue.use(VueFormWizard)
+            new Vue({
+             el: '#app',
+             data:{
+                loadingWizard: false
+             },
+             methods: {
+              onComplete: function(){
+                  $("#<?= $form->getId() ?>").submit();
+               },
+               setLoading: function(value) {
+                    this.loadingWizard = value
+                },
+                handleValidation: function(isValid, tabIndex){
+                    console.log('Tab: '+tabIndex+ ' valid: '+isValid)
+                },
+                beforeSelectProvenance: function(){
+                    return new Promise((resolve, reject) => {
+                        setTimeout(() => {
+                            let experimentUri = $("#experiment-selector").val();
+                            if(experimentUri === undefined || experimentUri === null || experimentUri === "" ){
+                                toastr.warning("You must select a valid experiment to continued");
+                                reject("You must select a valid experiment to continue");
+                            }else{
+                               resolve(true);
+                              }   
+                            }, 200)
+                    });
+                },
+                beforeUploadDataset: function(){
+                    return new Promise((resolve, reject) => {
+                        setTimeout(() => {
+                            let provenanceUri = $("#provenance-selector").val();
+                            if(provenanceUri === undefined ||
+                                    provenanceUri === null ||
+                                    provenanceUri === "" ||
+                                    !provenances.hasOwnProperty(provenanceUri)){
+                                toastr.warning("You must select a valid provenance to continued");
+                                reject("You must select a valid provenance to continue");
+                            }else{
+                               resolve(true);
+                              }   
+                            }, 200)
+                    });
+                }
+            }
+        });
             // Load document add form popin
             $('#document-content').load('<?php echo Url::to(['document/create-from-dataset']) ?>');
 
@@ -386,9 +635,10 @@
 
                 return false;
             });
-
+            
             // Open document add form on click
             $('.buttonDocuments').click(function () {
+                console.log("click")
                 nbDocuments++;
                 typeInsertedDocument = "document";
                 $('#document-modal').modal('toggle');
@@ -415,184 +665,69 @@
                         });
             });
             
-            populateVariableList($("#experiment-selector").val());
+           
             
-            // Verifiy saving form step
-            $('.collapse').on('show.bs.collapse', function (e) {
-                var target = e.target.id;
-                var varStepString = "step-0" ;
-
-                if( e.target.id === varStepString + 2 ){
-                    if($("#experiment-selector :selected").val() === ""){
-                        e.stopPropagation();
-                        e.preventDefault();
-                        toastr.warning('You must select an experiment, in step 1');
-                    }
-                }
-                if( e.target.id === varStepString + 3 ){
-                    if($("#experiment-selector :selected").val() === ""){
-                        e.stopPropagation();
-                        e.preventDefault();
-                        toastr.warning('You must select an experiment, in step 1');
-                    }else{
-                        $("#" + varStepString + 2).collapse('hide');
-                    }
-                }
-                if( e.target.id === varStepString + 4 ){
-                    if($("#experiment-selector :selected").val() === ""){
-                        e.stopPropagation();
-                        e.preventDefault();
-                        toastr.warning('You must select an experiment, in step 1');
-                    }
-                    if($("#provenance-selector :selected").val() === ""
-                          ||  !provenances.hasOwnProperty($("#provenance-selector :selected").val())){
-                        e.stopPropagation();
-                        e.preventDefault();
-                        toastr.warning('You must select a valid provenance or save your new provenance, in step 3');
-                    }
-                }
-            });
+            
+           
+        
+        // On provenance change update provenance fields
+        $("#experiment-selector").change(function () {
+             populateVariableList($(this).val());
         });
+         populateVariableList($("#experiment-selector").val());
         
-        /**
-         * Fill variable dropdown
-         * @param string experimentUri
-         * @returns void        */
-        function populateVariableList(experimentUri){
-            if(experimentUri !== undefined && experimentUri !== null ){
-                var select = $('#uriVariable-selector');
-                var settings = select.attr('data-krajee-select2'),
-
-                settings = window[settings];
-
-                $.ajax({
-                    url: '<?= Url::toRoute(['dataset/get-experiment-mesured-variables-select-list']); ?>',
-                    type: 'GET',
-                    dataType: 'json',
-                    data: {"experimentUri": experimentUri}
-                })
-                .done(function (data) {
+        // On provenance change update provenance fields
+        $("#provenance-selector").change(function () {
+            updateProvenanceFields($(this).val());
+        });
 
-                    settings.data = data.data;
-                    select.select2(settings);
-                })
-                .fail(function (jqXHR, textStatus) {
-                    // Disaply errors
-                    console.log(jqXHR)
-                });
-            }
+        // Update provenance fields depending of startup value
+        updateProvenanceFields($("#provenance-selector").val());
+     });    
+    </script>
+    <style>
+        /* This is a css loader. It's not related to vue-form-wizard */
+        .loader,
+        .loader:after {
+          border-radius: 50%;
+          width: 10em;
+          height: 10em;
         }
-        
-        /**
-         * Save provenance model via ajax
-         * @returns {Boolean}         */
-        function saveProvenance(){
-
-            var uriTest = $("#provenance-selector :selected").val();
-            
-            if(provenances.hasOwnProperty(uriTest)){
-                  toastr.info("Already existing provenance");
-            }
-            
-            if(!provenances.hasOwnProperty(uriTest) 
-                    && $("#provenance-selector :selected").val() !== undefined
-                    && $("#provenance-selector :selected").val() !== ""){
-                var provenance = {};
-                toastr.info("Saving provenance ...");
-                provenance['label']= $("#provenance-selector :selected").val();
-                provenance['comment']= $("#yiidatasetmodel-provenancecomment").val();
-                provenance['documents']= [];
-                if($("#yiidatasetmodel-documentsuris").val() !== undefined){
-                    provenance['documents']= $("#yiidatasetmodel-documentsuris").val();
-                }
-                provenance['sensingDevices']= [];
-                if($("#yiidatasetmodel-sensingDevices").val() !== undefined){
-                    provenance['sensingDevices']= $("#yiidatasetmodel-sensingDevices").val();
-                }
-                provenance['agents']= [];
-                if($("#yiidatasetmodel-provenanceagents").val() !== undefined){
-                    provenance['agents']= $("#yiidatasetmodel-provenanceagents").val();
-                }
-                console.log(provenance);
-                 $.ajax({
-                    url: 'index.php?r=dataset%2Fcreate-provenance-from-dataset',
-                    type: 'POST',
-                    datatype: 'json',
-                    data: provenance
-
-                })
-                .done(function (data) {
-                    var select = $('#provenance-selector');
-                    var settings = select.attr('data-krajee-select2'),
-                    settings = window[settings];
-                    
-                    provenances = data.provenances;
-                    console.log(provenances);
-                    settings.data = data.provenancesByUri;
-                    select.select2(settings);
-                    updateProvenanceFields(data.newProvenanceUri);
-                    console.log(provenances.hasOwnProperty(data.newProvenanceUri))
-                    toastr.success("Provenance saved");
-                })
-                .fail(function (jqXHR, textStatus) {
-                    // Disaply errors
-                    $('#document-save-msg').parent().removeClass('alert-info');
-                    $('#document-save-msg').parent().addClass('alert-danger');
-                    $('#document-save-msg').html('Request failed: ' + textStatus);
-                    toastr.error("An error has occured during provenance saving");
-                });
-
-            return false;   
-            }
+        .loader {
+          margin: 60px auto;
+          font-size: 10px;
+          position: relative;
+          text-indent: -9999em;
+          border-top: 1.1em solid rgba(255, 255, 255, 0.2);
+          border-right: 1.1em solid rgba(255, 255, 255, 0.2);
+          border-bottom: 1.1em solid rgba(255, 255, 255, 0.2);
+          border-left: 1.1em solid #0033ff;
+          -webkit-transform: translateZ(0);
+          -ms-transform: translateZ(0);
+          transform: translateZ(0);
+          -webkit-animation: load8 1.1s infinite linear;
+          animation: load8 1.1s infinite linear;
         }
-        
-        /**
-        * Function to update provenance comment field depending of selected URI
-         * @param string  provenance uri
-         * @returns {undefined}         */
-        function updateProvenanceFields(uri) {
-            if (provenances.hasOwnProperty(uri)) {
-                // If selected provenance is known get its comment
-                var comment = provenances[uri]["comment"];
-
-                // Set provenance comment, disable input and remove validation messages 
-                $("#yiidatasetmodel-provenancecomment").val(comment).attr("disabled", "disabled");
-                $(".field-yiidatasetmodel-provenancecomment, .field-yiidatasetmodel-provenancecomment *")
-                        .removeClass("has-error")
-                        .removeClass("has-success");
-                $(".field-yiidatasetmodel-provenancecomment .help-block").empty();
-
-                // Set provenance provenanceAgents, disable input and remove validation messages 
-                try {
-                    var provenanceAgents = provenances[uri]["metadata"]["prov:Agent"]["oeso:Operator"];
-                    $("#yiidatasetmodel-provenanceagents").val(provenanceAgents);
-                    $("#yiidatasetmodel-provenanceagents").trigger("change");
-                } catch (error) {
-                    $("#yiidatasetmodel-provenanceagents").val([]);
-                    $("#yiidatasetmodel-provenanceagents").trigger("change");
-                    console.log("No agents set");
-                } finally {
-                    $("#yiidatasetmodel-provenanceagents").val(agents).attr("disabled", "disabled");
-                    $(".field-yiidatasetmodel-provenanceagents, .field-yiidatasetmodel-provenanceagents *")
-                            .removeClass("has-error")
-                            .removeClass("has-success");
-                    $(".field-yiidatasetmodel-provenanceagents .help-block").empty();
-                }
-                // Load linked documents
-                $("#already-linked-documents").load(documentsLoadUri, {
-                    "uri": uri
-                })
-            } else {
-                // Otherwise clear provenance agents and enable input
-                $("#yiidatasetmodel-provenanceagents").val(agents).removeAttr("disabled").trigger("change");
-
-                // Otherwise clear provenance comment and enable input
-                $("#yiidatasetmodel-provenancecomment").val("").removeAttr("disabled");
-
-                // Clear linked documents list
-                $("#already-linked-documents").empty();
-            }
+        @-webkit-keyframes load8 {
+          0% {
+            -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+          }
+          100% {
+            -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+          }
         }
-    </script>
+        @keyframes load8 {
+          0% {
+            -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+          }
+          100% {
+            -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+          }
+        }
+    </style>
 </div>
 </div>
\ No newline at end of file

From 9aa0d1f2ab1d30d60cd7c9ec8da98de7db610d66 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Mon, 2 Dec 2019 14:49:23 +0100
Subject: [PATCH 25/35] Move created date to provenance fu=ield

---
 controllers/DatasetController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index 0344f95d..9ab2dcf4 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -519,7 +519,6 @@ private function createProvenance($alias, $comment,$sensingDevice = null, $agent
         $createdDate = $date->format("Y-m-d\TH:i:sO");
         $metadata = [
             "namespaces" => Yii::$app->params[self::PROVENANCE_PARAMS_VALUES],
-            "created" => $date->format("Y-m-d\TH:i:sO"),
             "prov:Agent" =>[
                 "oeso:SensingDevice" => [
                 ],

From dfdd4ed515684b59742c2176aaceccf3ae787b05 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Mon, 2 Dec 2019 18:19:51 +0100
Subject: [PATCH 26/35] Add vocabulary

---
 models/yiiModels/YiiDatasetModel.php |  4 +--
 translations/fr/app.php              | 20 +++++++++++--
 translations/fr/messages.php         |  1 +
 views/dataset/_form.php              | 43 +++++++++++++++-------------
 4 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/models/yiiModels/YiiDatasetModel.php b/models/yiiModels/YiiDatasetModel.php
index 97f2f0f4..ab754348 100755
--- a/models/yiiModels/YiiDatasetModel.php
+++ b/models/yiiModels/YiiDatasetModel.php
@@ -129,8 +129,8 @@ public function attributeLabels() {
         return [
             'provenanceUri' => Yii::t('app', 'Provenance label'),
             'provenanceComment' => Yii::t('app', 'Provenance comment'),
-            'provenanceSensingDevices' => Yii::t('app', 'Sensor'),
-            'provenanceAgents' => Yii::t('app', 'Operator'),
+            'provenanceSensingDevices' => Yii::t('app', 'Provenance sensor(s)'),
+            'provenanceAgents' => Yii::t('app', 'Provenance operator(s)'),
             'variables' => Yii::t('app', 'Experiment associated variable(s)'),
             'file' => Yii::t('app', 'Data file'),
             'documentsUris' => Yii::t('app', 'Documents'),
diff --git a/translations/fr/app.php b/translations/fr/app.php
index 495e201a..aa8cecec 100755
--- a/translations/fr/app.php
+++ b/translations/fr/app.php
@@ -49,6 +49,7 @@
     'Add Dataset' => 'Importer un jeu de données',
     'Add Document' => 'Ajouter un document',
     'Add Document Script' => 'Ajouter un script',
+    'Add on scientific object' => 'Importer pour un objet scientifique',
     'Add row' => 'Ajouter une ligne',
     'Add Sensors' => 'Ajouter des Capteurs',
     'Add Vectors' => 'Ajouter des Vecteurs',
@@ -66,6 +67,7 @@
     'Availability' => 'Disponibilité',
 
     // B
+    'Back' => 'Retour',
     'Back to sensor view' => 'Retour à la vue du capteur',
     'Brand' => 'Marque',
     'BRDF coefficient P1' => 'Coefficient BRDF P1',
@@ -80,6 +82,7 @@
     'Characterize Sensor' => 'Caractériser un Capteur',
     'Characterize' => 'Caractériser',
     'Circular' => 'Circulaire',
+    'Choose experiment' => 'Choisir une expérimentation' ,
     'Contact' => 'Contact',
     'Contact / Help' => 'Contact / Aide',
     'Column' => 'Colonne',
@@ -96,6 +99,7 @@
     'Comment' => 'Commentaire',
     'Creation Date' => 'Date de Création',
     'Creator' => 'Auteur',
+    'Create provenance' => 'Créer la provenance',
     'Creator of the annotation' => 'Auteur de l\'annotation',
     'Crop Species' => 'Espèce',
 
@@ -105,12 +109,14 @@
     'Data Search'=>'Recherche de données',
     'Dataset' => 'Jeux de données',
     'Dataset Creation Date' => 'Données Insérées',
+    'Dataset input file' => 'Fichier de jeu de données',
     'Date' => 'Date',
     'Date End' => 'Date de fin',
     'Date Of Last Calibration' => 'Date de Dernier Étalonnage',
     'Date Of Purchase' => 'Date d\'Achat',
     'Date Start' => 'Date de début',
     'Description' => 'Description',
+    'Describe the produced dataset' => 'Décrire le jeu de données',
     'Diameter' => 'Diamètre',
     'Diameter (m)' => 'Diamètre (m)',
     'Document Type' => 'Type du Document',
@@ -130,6 +136,7 @@
     'Experimental Organization' => 'Organisation expérimentale',
     'Experiment'=>'Expérimentation',
     'Experiment Modalities' => 'Modalités Expérimentales',
+    'Experiment associated variable(s)' => 'Variable(s) associées à l\'expérimentation',
     EventAction::EVENT_UNUPDATABLE_DUE_TO_UNUPDATABLE_PROPRTY_LABEL =>
         "L'événement ne peut être mis à jour que via le web service car une de "
         . "ses propriétés spécifiques n'est actuellement pas compatible avec la webapp.",
@@ -159,6 +166,8 @@
     'Generate Layer' => 'Générer la Couche',
     'Generate Map' => 'Générer la Carte',
     'Generated URI' => 'URI générée',
+    'Generate dataset template' => 'Générer le gabarit du jeux de données',
+    'Generate dataset template (Optional)' => 'Generer le gabarit du jeu de données (Optionnel)',
     'Geographic Location' => 'Localisation géographique',
     'Geometry' => 'Géométrie',
     'Graphic visualization' => 'Visualisation graphique',
@@ -210,6 +219,8 @@
 
     // N
     'Name' => 'Nom',
+    'Need a dataset template ? (Optional)'=> 'Besoin d\'un gabarit jeu de données ? (Optionnel)',
+    'Next' => 'Suivant',
     'No' => 'Non',
     'No item concerned' => 'Aucun élément concerné',
     'No Specific Property' => 'Aucune Propriété Spécifique',
@@ -236,7 +247,10 @@
     'Properties'=>'Propriétés',
     PropertyWidget::NO_PROPERTY_LABEL => 'Aucune propriété spécifique',
     'Provenance comment' => 'Commentaire de la provenance',
-    'Provenance (URI)' => 'Provenance (URI)',
+    'Provenance (URI)' => 'Identifiant de la provenance',
+    'Provenance label' => 'Label de la provenance',
+    'Provenance operator(s)' => 'Opérateur(s) lié(s) à la provenance',
+    'Provenance sensor(s)' => 'Capteur(s) lié(s) à la provenance',
     'Public Access' => 'Accès Public',
 
     // Q
@@ -302,7 +316,8 @@
     'Update event' => 'Modifier l\'événement',
     'Update sensors' => 'Mise à jour des capteurs',
     'Update measured variables' => 'Mise à jour des variables mesurées',
-
+    'Upload dataset' => 'Soumettre le jeu de données',
+        
     // V
     'Value' => 'Valeur',
     'Value Labels' => 'Labels de la Valeur',
@@ -312,6 +327,7 @@
     'Variety' => 'Variété',
     'Verification Code' => 'Code de vérification',
     'View / Download' => 'Visualiser / Télécharger',
+    'View' => 'Visualiser',
 
     // W
     'Was Generated By' => 'Généré Par',
diff --git a/translations/fr/messages.php b/translations/fr/messages.php
index f73110c6..1599f842 100755
--- a/translations/fr/messages.php
+++ b/translations/fr/messages.php
@@ -119,6 +119,7 @@
     'The variety used in the plot (e.g. apache)' => 'La variété du plot (ex. apache)',
     'To assign scientific objects to two experiments: (1) create the scientific objects on one of the experiments and (2) update them with the uri of the second experiment.' => 'Pour affecter des objets scientifiques à deux expériences: (1) créez les objets scientifiques sur l\'une des expériences et (2) mettez-les à jour avec l\'uri de la deuxième expérience.',
     'to get more information about the columns content' => 'pour obtenir davantage d\'information sur le contenu de chaque colonne',
+    'The variables associated to the choosen experiment' => 'Les variables associées à l\'expérimentation choisie',
 
     // U
     'Unknown error' => 'Erreur inconnue',
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index 604a1712..7c9d758e 100644
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -296,12 +296,12 @@ function updateProvenanceFields(uri) {
                              @on-loading="setLoading"
                               shape="square"
                               color="#3498db"
-                              back-button-text="<?= Yii::t('app/messages','Back') ?>"
-                              next-button-text="<?= Yii::t('app/messages','Next') ?>"
-                              finish-button-text="<?= Yii::t('yii', 'Upload dataset') ?>"
+                              back-button-text="<?= Yii::t('app','Back') ?>"
+                              next-button-text="<?= Yii::t('app','Next') ?>"
+                              finish-button-text="<?= Yii::t('app', 'Upload dataset') ?>"
                               >
                     <div class="loader" v-if="loadingWizard"></div>
-                    <tab-content title="Choose experiment"
+                    <tab-content title="<?= Yii::t('app','Choose experiment') ?>"
                                  icon="ti-user" 
                                  :before-change="beforeSelectProvenance">
     <?=
@@ -322,15 +322,15 @@ function updateProvenanceFields(uri) {
     ]);
     ?>
             </tab-content>
-            <tab-content title="Generate dataset template (optional)"
+            <tab-content title="<?= Yii::t('app','Generate dataset template (Optional)') ?>"
                                          icon="ti-user" 
                                          :before-change="beforeSelectProvenance">
             <hr style="border-color:gray;"/>
             <h3><i>  <?= Yii::t('app', 'Need a dataset template ? (Optional)') ?></i></h3>
-            <p class="alert alert-info"><?= Yii::t('app/messages', 'The variables below are associated to the choosen experiment'); ?></p>
+            <p class="alert alert-info"><?= Yii::t('app/messages', 'The variables associated to the choosen experiment'); ?></p>
     <?php
         $select2VariablesOptions =  [
-            'placeholder' => Yii::t('app/messages', 'Select one or many experiment associated variables') . ' ...',
+            'placeholder' => Yii::t('app/messages', 'Select one or more variables') . ' ...',
             'id' => 'uriVariable-selector',
             'multiple' => true
         ]; 
@@ -346,20 +346,20 @@ function updateProvenanceFields(uri) {
             ],
         ]);
     ?>
-    <p>
-    <?php
-        $csvPath = "coma";
-        if (Yii::$app->params['csvSeparator'] == ";") {
-            $csvPath = "semicolon";
-        }
-    ?>
-    <i>
+            
+                <p>
+                <?php
+                    $csvPath = "coma";
+                    if (Yii::$app->params['csvSeparator'] == ";") {
+                        $csvPath = "semicolon";
+                    }
+                ?>
+                <i>
     
                 </i>
                 </p>
 
                 <hr>
-                <hr style="border-color:gray;"/>
                 <i style="float: right"><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Example'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetExemple.csv') ?></i>
                     <br>
                     <div class="alert alert-info" role="alert">
@@ -387,14 +387,14 @@ function updateProvenanceFields(uri) {
                     </div>               
                     
                     <?= 
-        Html::a("<button type='button' class='btn btn-info'> " . Yii::t('app', 'Download generated template') . "</button>",
+        Html::a("<button type='button' class='btn btn-success'> " . Yii::t('app', 'Download Template') . "</button>",
             \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetTemplate.csv',
             ['id' => 'downloadDatasetTemplate']
         );
     ?>
                     <br><br>
                 </tab-content>
-                <tab-content title="Select or create a description that describes how the dataset was produced"
+                <tab-content title="<?= Yii::t('app','Describe the produced dataset') ?>"
                                  icon="ti-settings"
                                  :before-change="beforeUploadDataset">
                        <h4><?= Yii::t('app', 'Provenance'); ?></h4>
@@ -452,10 +452,13 @@ function updateProvenanceFields(uri) {
         ],
     ])->label(false)
     ?>
-    <?= Html::button(Yii::t('yii', 'Save provenance'), ['class' => 'btn btn-success','onclick' => 'saveProvenance()']) ?>
+    <br>
+    <?= Html::button(Yii::t('app', 'Create provenance'), ['class' => 'btn btn-success','onclick' => 'saveProvenance()']) ?>
+    <br>
+    <br>
 
                     </tab-content>
-                    <tab-content title="Upload dataset"
+                    <tab-content title="<?= Yii::t('app','Upload dataset'); ?>"
                                  icon="ti-check">
                     <h3><i>  <?= Yii::t('app', 'Dataset input file') ?></i></h3>
 

From 5bee9c25834c979c5e0ec7800edac70396d4f2e0 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Mon, 2 Dec 2019 21:06:06 +0100
Subject: [PATCH 27/35] Update dataset

---
 controllers/DatasetController.php |  22 +-
 views/dataset/_form.php           | 460 +++++++++++++++---------------
 2 files changed, 245 insertions(+), 237 deletions(-)

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index 9ab2dcf4..aaa1f65d 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -139,8 +139,11 @@ public function actionGenerateAndDownloadDatasetCreationFile() {
     
     
     /**
-     * 
-     * @param type $experimentUri
+     * Create a provenance from post data with documents Uri associated
+     * [
+     *  provenance : { label, comment, metadata:{ ... } },
+     *  documents : { uri1,uri2}
+     * ]
      */
     public function actionCreateProvenanceFromDataset(){
 
@@ -168,13 +171,17 @@ public function actionCreateProvenanceFromDataset(){
         return false;
     }
     
+    /**
+     * Return an array with provenance list with all characteristics
+     * and provenance label mapped with provenance uri
+     * @return array
+     */
     public function actionGetProvenancesSelectList(){
         $token = Yii::$app->session[WSConstants::ACCESS_TOKEN];
 
         Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
         $provenanceService = new WSProvenanceModel();
 
-        $provenances= [];
         $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
         
         foreach ($provenances as $uri => $provenance) {
@@ -186,8 +193,8 @@ public function actionGetProvenancesSelectList(){
     }
     
     /**
-     * 
-     * @param type $experimentUri
+     * Return an array of variable label mapped with variable uri
+     * @return array
      */
     public function actionGetExperimentMesuredVariablesSelectList($experimentUri){
         
@@ -202,6 +209,11 @@ public function actionGetExperimentMesuredVariablesSelectList($experimentUri){
         return($variables);
     }
     
+    /**
+     * Prepare a variable list associated to an experiment
+     * @param string $experimentUri
+     * @return array
+     */
     private function getExperimentMesuredVariablesSelectList($experimentUri) {
         if(!isset($experimentUri) || empty($experimentUri)){
             return [];
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index 7c9d758e..1a4419fa 100644
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -217,6 +217,68 @@ function updateProvenanceFields(uri) {
                 $("#already-linked-documents").empty();
             }
         }
+        
+        /**
+         *
+         * @returns void         */
+        function refreshRules(){
+             $(".dataset-variables").remove();
+                if($("#uriVariable-selector :selected").length > 0){
+                    $("#uriVariable-selector :selected").each(function (i, sel) {
+                        $('#dataset-csv-columns-desc').append(
+                                '<tr class="dataset-variables">'
+                                + '<th style="color:red" >'
+                                + $(sel).text() + ' *'
+                                + '</th>'
+                                + '<td>'
+                                + '<?php echo Yii::t("app/messages", "Value"); ?> (<?php echo Yii::t('app', 'Real number, String or Date'); ?>)'
+                                + '</td>'
+                                + '</tr>');
+                    }); 
+                }else{
+                    $('#dataset-csv-columns-desc').append(
+                                '<tr class="dataset-variables">'
+                              + '<th style="color:red">Variable value *</th>'
+                              + '<td ><?= Yii::t('app', 'Variable value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)'
+                              + '</td>'
+                              + '</tr>');
+                }
+        }
+        
+        function saveDocument(){
+            // On save get document form values
+            var formData = new FormData();
+            var file_data = $('#document-content #yiidocumentmodel-file').prop('files')[0];
+            formData.append('file', file_data);
+            var other_data = $('form').serializeArray();
+            $.each(other_data, function (key, input) {
+                formData.append(input.name, input.value);
+            });
+
+            // Send documents form
+            $.ajax({
+                url: 'index.php?r=document%2Fcreate-from-dataset',
+                type: 'POST',
+                processData: false,
+                datatype: 'json',
+                contentType: false,
+                data: formData
+
+            })
+            .done(function (data) {
+                    // Add document URI and close document add form
+                    $('#yiidatasetmodel-documentsuris-documenturi-' + nbDocuments).val(data);
+                    documentUploaded = true;
+                    $('#document-modal').modal('toggle');
+
+            })
+            .fail(function (jqXHR, textStatus) {
+                    // Disaply errors
+                    $('#document-save-msg').parent().removeClass('alert-info');
+                    $('#document-save-msg').parent().addClass('alert-danger');
+                    $('#document-save-msg').html('Request failed: ' + textStatus);
+            });
+        }
     </script>
         <script>
     $(document).ready(function () {
@@ -328,25 +390,25 @@ function updateProvenanceFields(uri) {
             <hr style="border-color:gray;"/>
             <h3><i>  <?= Yii::t('app', 'Need a dataset template ? (Optional)') ?></i></h3>
             <p class="alert alert-info"><?= Yii::t('app/messages', 'The variables associated to the choosen experiment'); ?></p>
-    <?php
-        $select2VariablesOptions =  [
-            'placeholder' => Yii::t('app/messages', 'Select one or more variables') . ' ...',
-            'id' => 'uriVariable-selector',
-            'multiple' => true
-        ]; 
-    ?>
-    
-    <?=
-        $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(), [
-            'data' => [],
-            'options' => $select2VariablesOptions,
-            'pluginOptions' => [
-                'allowClear' => true,
-                'tags' => false
-            ],
-        ]);
-    ?>
-            
+        <?php
+            $select2VariablesOptions =  [
+                'placeholder' => Yii::t('app/messages', 'Select one or more variables') . ' ...',
+                'id' => 'uriVariable-selector',
+                'multiple' => true
+            ]; 
+        ?>
+
+        <?=
+            $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(), [
+                'data' => [],
+                'options' => $select2VariablesOptions,
+                'pluginOptions' => [
+                    'allowClear' => true,
+                    'tags' => false
+                ],
+            ]);
+        ?>
+
                 <p>
                 <?php
                     $csvPath = "coma";
@@ -386,13 +448,13 @@ function updateProvenanceFields(uri) {
                         </table>
                     </div>               
                     
-                    <?= 
+        <?= 
         Html::a("<button type='button' class='btn btn-success'> " . Yii::t('app', 'Download Template') . "</button>",
             \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetTemplate.csv',
             ['id' => 'downloadDatasetTemplate']
         );
-    ?>
-                    <br><br>
+        ?>
+                <br><br>
                 </tab-content>
                 <tab-content title="<?= Yii::t('app','Describe the produced dataset') ?>"
                                  icon="ti-settings"
@@ -400,67 +462,67 @@ function updateProvenanceFields(uri) {
                        <h4><?= Yii::t('app', 'Provenance'); ?></h4>
                 <p class="alert alert-info"><?= Yii::t('app/messages', 'To create a new provenance, write the provenance label in the research field and press `Enter`'); ?></p>
     
-    <?=
-    $form->field($model, 'provenanceUri')->widget(\kartik\select2\Select2::classname(), [
-        'data' => $provenancesArray,
-        'options' => [
-            'placeholder' => Yii::t('app/messages', 'Select existing provenance or create a new one') . ' ...',
-            'id' => 'provenance-selector',
-            'multiple' => false
-        ],
-        'pluginOptions' => [
-            'allowClear' => true,
-            'tags' => true
-        ],
-    ]);
-    ?>
-
-    <?=
-    $form->field($model, 'provenanceAgents')->widget(\kartik\select2\Select2::classname(), [
-        'data' => $this->params['agents'],
-        'options' => [
-            'placeholder' => 'Select operator ...',
-            'multiple' => true
-        ],
-        'pluginOptions' => [
-            'allowClear' => true
-        ],
-    ]);
-    ?>
+        <?=
+        $form->field($model, 'provenanceUri')->widget(\kartik\select2\Select2::classname(), [
+            'data' => $provenancesArray,
+            'options' => [
+                'placeholder' => Yii::t('app/messages', 'Select existing provenance or create a new one') . ' ...',
+                'id' => 'provenance-selector',
+                'multiple' => false
+            ],
+            'pluginOptions' => [
+                'allowClear' => true,
+                'tags' => true
+            ],
+        ]);
+        ?>
 
-    <?= $form->field($model, 'provenanceComment')->textarea(['rows' => 6]) ?>
+        <?=
+        $form->field($model, 'provenanceAgents')->widget(\kartik\select2\Select2::classname(), [
+            'data' => $this->params['agents'],
+            'options' => [
+                'placeholder' => 'Select operator ...',
+                'multiple' => true
+            ],
+            'pluginOptions' => [
+                'allowClear' => true
+            ],
+        ]);
+        ?>
 
-            <h3><?= Yii::t('app', 'Linked Document(s)') ?></h3>
-            <div id="already-linked-documents"></div>
-    <?=
-    $form->field($model, 'documentsURIs')->widget(MultipleInput::className(), [
-        'max' => 6,
-        'allowEmptyList' => true,
-        'enableGuessTitle' => true,
-        'columns' => [
-            [
-                'name' => 'documentURI',
-                'options' => [
-                    'readonly' => true,
-                    'style' => 'background-color:#C4DAE7;',
+        <?= $form->field($model, 'provenanceComment')->textarea(['rows' => 6]) ?>
+
+                <h3><?= Yii::t('app', 'Linked Document(s)') ?></h3>
+                <div id="already-linked-documents"></div>
+        <?=
+        $form->field($model, 'documentsURIs')->widget(MultipleInput::className(), [
+            'max' => 6,
+            'allowEmptyList' => true,
+            'enableGuessTitle' => true,
+            'columns' => [
+                [
+                    'name' => 'documentURI',
+                    'options' => [
+                        'readonly' => true,
+                        'style' => 'background-color:#C4DAE7;',
+                    ]
                 ]
-            ]
-        ],
-        'addButtonOptions' => [
-            'class' => 'btn btn-primary buttonDocuments',
-            'label' => Yii::t('app', 'Add Document'),            
-        ],
-    ])->label(false)
-    ?>
-    <br>
-    <?= Html::button(Yii::t('app', 'Create provenance'), ['class' => 'btn btn-success','onclick' => 'saveProvenance()']) ?>
-    <br>
-    <br>
+            ],
+            'addButtonOptions' => [
+                'class' => 'btn btn-primary buttonDocuments',
+                'label' => Yii::t('app', 'Add Document'),            
+            ],
+        ])->label(false)
+        ?>
+        <br>
+        <?= Html::button(Yii::t('app', 'Create provenance'), ['class' => 'btn btn-success','onclick' => 'saveProvenance()']) ?>
+        <br>
+        <br>
 
-                    </tab-content>
-                    <tab-content title="<?= Yii::t('app','Upload dataset'); ?>"
-                                 icon="ti-check">
-                    <h3><i>  <?= Yii::t('app', 'Dataset input file') ?></i></h3>
+                </tab-content>
+                <tab-content title="<?= Yii::t('app','Upload dataset'); ?>"
+                             icon="ti-check">
+                <h3><i>  <?= Yii::t('app', 'Dataset input file') ?></i></h3>
 
             <?=
             $form->field($model, 'file')->widget(FileInput::classname(), [
@@ -472,7 +534,6 @@ function updateProvenanceFields(uri) {
             ?>
 
                         <div class="form-group">
-            <?php // Html::submitButton(Yii::t('yii', 'Save dataset'), ['class' => 'btn btn-success']) ?>
                         </div>
                         </div>
         <?php ActiveForm::end(); ?>
@@ -497,181 +558,116 @@ function updateProvenanceFields(uri) {
                 </div>
             </template>
             </div>
-        </div>     
-        
-        
+        </div>
     </div>
-  
-   
-    
     <div>
-    
-       
     <script>
         $(document).ready(function () {
-             Vue.use(VueFormWizard)
+            Vue.use(VueFormWizard)
             new Vue({
              el: '#app',
              data:{
                 loadingWizard: false
              },
              methods: {
-              onComplete: function(){
-                  $("#<?= $form->getId() ?>").submit();
-               },
-               setLoading: function(value) {
-                    this.loadingWizard = value
+                onComplete: function(){
+                    $("#<?= $form->getId() ?>").submit();
+                },
+                setLoading: function(value) {
+                      this.loadingWizard = value
                 },
                 handleValidation: function(isValid, tabIndex){
-                    console.log('Tab: '+tabIndex+ ' valid: '+isValid)
+                      console.log('Tab: '+tabIndex+ ' valid: '+isValid)
                 },
                 beforeSelectProvenance: function(){
-                    return new Promise((resolve, reject) => {
-                        setTimeout(() => {
-                            let experimentUri = $("#experiment-selector").val();
-                            if(experimentUri === undefined || experimentUri === null || experimentUri === "" ){
-                                toastr.warning("You must select a valid experiment to continued");
-                                reject("You must select a valid experiment to continue");
-                            }else{
-                               resolve(true);
-                              }   
-                            }, 200)
-                    });
-                },
-                beforeUploadDataset: function(){
-                    return new Promise((resolve, reject) => {
-                        setTimeout(() => {
-                            let provenanceUri = $("#provenance-selector").val();
-                            if(provenanceUri === undefined ||
-                                    provenanceUri === null ||
-                                    provenanceUri === "" ||
-                                    !provenances.hasOwnProperty(provenanceUri)){
-                                toastr.warning("You must select a valid provenance to continued");
-                                reject("You must select a valid provenance to continue");
-                            }else{
-                               resolve(true);
-                              }   
-                            }, 200)
-                    });
-                }
-            }
+                      return new Promise((resolve, reject) => {
+                          setTimeout(() => {
+                              let experimentUri = $("#experiment-selector").val();
+                              if(experimentUri === undefined || experimentUri === null || experimentUri === "" ){
+                                  toastr.warning("You must select a valid experiment to continued");
+                                  reject("You must select a valid experiment to continue");
+                              }else{
+                                 resolve(true);
+                                }   
+                              }, 200)
+                      });
+                  },
+                  beforeUploadDataset: function(){
+                      return new Promise((resolve, reject) => {
+                          setTimeout(() => {
+                              let provenanceUri = $("#provenance-selector").val();
+                              if(provenanceUri === undefined ||
+                                      provenanceUri === null ||
+                                      provenanceUri === "" ||
+                                      !provenances.hasOwnProperty(provenanceUri)){
+                                  toastr.warning("You must select a valid provenance to continued");
+                                  reject("You must select a valid provenance to continue");
+                              }else{
+                                 resolve(true);
+                                }   
+                              }, 200)
+                      });
+                  }
+              }
         });
-            // Load document add form popin
-            $('#document-content').load('<?php echo Url::to(['document/create-from-dataset']) ?>');
-
-            var documentUploaded = false;
-            // Clear last uploaded document line if document add form is canceled
-            $('#document-modal').on('hidden.bs.modal', function () {
-                if (!documentUploaded) {
-                    $(".js-input-remove:last").click();
-                }
-                documentUploaded = false;
-
-                $('#document-content form').trigger('reset');
+            
+        // Load document add form popin
+        $('#document-content').load('<?php echo Url::to(['document/create-from-dataset']) ?>');
+
+        var documentUploaded = false;
+        // Clear last uploaded document line if document add form is canceled
+        $('#document-modal').on('hidden.bs.modal', function () {
+            if (!documentUploaded) {
+                $(".js-input-remove:last").click();
+            }
+            documentUploaded = false;
 
-                $('#document-save-msg').parent().removeClass('alert-danger');
-                $('#document-save-msg').parent().addClass('alert-info');
-                $('#document-save-msg').html('<?php echo Yii::t('app/messages', 'Request text'); ?>');
-            });
+            $('#document-content form').trigger('reset');
 
-            $(document).on('change', '#uriVariable-selector', function () {
-                $(".dataset-variables").remove();
-                if($("#uriVariable-selector :selected").length > 0){
-                    $("#uriVariable-selector :selected").each(function (i, sel) {
-                        $('#dataset-csv-columns-desc').append(
-                                '<tr class="dataset-variables">'
-                                + '<th style="color:red" >'
-                                + $(sel).text() + ' *'
-                                + '</th>'
-                                + '<td>'
-                                + '<?php echo Yii::t("app/messages", "Value"); ?> (<?php echo Yii::t('app', 'Real number, String or Date'); ?>)'
-                                + '</td>'
-                                + '</tr>');
-                    }); 
-                }else{
-                    $('#dataset-csv-columns-desc').append(
-                                '<tr class="dataset-variables">'
-                              + '<th style="color:red">Variable value *</th>'
-                              + '<td ><?= Yii::t('app', 'Variable value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)'
-                              + '</td>'
-                              + '</tr>');
-                }
-            });
-
-           
-
-            // Initial document count
-            var nbDocuments = -1;
-            $(document).on('click', '#document-save', function () {
-                // On save get document form values
-                var formData = new FormData();
-                var file_data = $('#document-content #yiidocumentmodel-file').prop('files')[0];
-                formData.append('file', file_data);
-                var other_data = $('form').serializeArray();
-                $.each(other_data, function (key, input) {
-                    formData.append(input.name, input.value);
-                });
+            $('#document-save-msg').parent().removeClass('alert-danger');
+            $('#document-save-msg').parent().addClass('alert-info');
+            $('#document-save-msg').html('<?php echo Yii::t('app/messages', 'Request text'); ?>');
+        });
 
-                // Send documents form
-                $.ajax({
-                    url: 'index.php?r=document%2Fcreate-from-dataset',
-                    type: 'POST',
-                    processData: false,
-                    datatype: 'json',
-                    contentType: false,
-                    data: formData
+        $(document).on('change', '#uriVariable-selector', function () {
+           refreshRules();
+        });
 
-                })
-                .done(function (data) {
-                        // Add document URI and close document add form
-                        $('#yiidatasetmodel-documentsuris-documenturi-' + nbDocuments).val(data);
-                        documentUploaded = true;
-                        $('#document-modal').modal('toggle');
+        // Initial document count
+        var nbDocuments = -1;
+        $(document).on('click', '#document-save', function () {
+            saveDocument();
+            return false;
+        });
 
-                })
-                .fail(function (jqXHR, textStatus) {
-                        // Disaply errors
-                        $('#document-save-msg').parent().removeClass('alert-info');
-                        $('#document-save-msg').parent().addClass('alert-danger');
-                        $('#document-save-msg').html('Request failed: ' + textStatus);
-                });
+        // Open document add form on click
+        $('.buttonDocuments').click(function () {
+            console.log("click")
+            nbDocuments++;
+            typeInsertedDocument = "document";
+            $('#document-modal').modal('toggle');
+        });
 
-                return false;
+        // Download adjusted to variables CSV template file on click
+        $(document).on('change', '#uriVariable-selector', function () {
+            var variablesLabels = [];
+            $("#uriVariable-selector :selected").each(function (i, sel) {
+                variablesLabels.push($(sel).text());
             });
-            
-            // Open document add form on click
-            $('.buttonDocuments').click(function () {
-                console.log("click")
-                nbDocuments++;
-                typeInsertedDocument = "document";
-                $('#document-modal').modal('toggle');
+            $.ajax({
+                url: 'index.php?r=dataset%2Fgenerate-and-download-dataset-creation-file',
+                type: 'POST',
+                datatype: 'json',
+                data: {variables: variablesLabels}
+            })
+            .done(function (data) {
+            })
+            .fail(function (jqXHR, textStatus) {
+                $('#document-save-msg').parent().removeClass('alert-info');
+                $('#document-save-msg').parent().addClass('alert-danger');
+                $('#document-save-msg').html('Request failed: ' + textStatus);
             });
-
-            // Download adjusted to variables CSV template file on click
-            $(document).on('change', '#uriVariable-selector', function () {
-                var variablesLabels = [];
-                $("#uriVariable-selector :selected").each(function (i, sel) {
-                    variablesLabels.push($(sel).text());
-                });
-                $.ajax({
-                    url: 'index.php?r=dataset%2Fgenerate-and-download-dataset-creation-file',
-                    type: 'POST',
-                    datatype: 'json',
-                    data: {variables: variablesLabels}
-                })
-                        .done(function (data) {
-                        })
-                        .fail(function (jqXHR, textStatus) {
-                            $('#document-save-msg').parent().removeClass('alert-info');
-                            $('#document-save-msg').parent().addClass('alert-danger');
-                            $('#document-save-msg').html('Request failed: ' + textStatus);
-                        });
-            });
-            
-           
-            
-            
-           
+        });
         
         // On provenance change update provenance fields
         $("#experiment-selector").change(function () {

From 610451b0811a00bf15e7ed871895c8a15eec9b34 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Tue, 3 Dec 2019 09:14:58 +0100
Subject: [PATCH 28/35] Create provenance controller udpate form and
 refactoring

---
 controllers/DatasetController.php    | 171 +-----------------------
 controllers/ExperimentController.php |  38 ++++++
 controllers/ProvenanceController.php | 192 +++++++++++++++++++++++++++
 views/dataset/_form.php              |  88 ++++++------
 4 files changed, 278 insertions(+), 211 deletions(-)
 create mode 100644 controllers/ProvenanceController.php

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index aaa1f65d..d9e5a869 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -51,7 +51,6 @@ class DatasetController extends Controller {
     const ERRORS_COLUMN = "Column";
     const ERRORS_MESSAGE = "Message";
     
-    const PROVENANCE_PARAMS_VALUES = "provenanceNamespaces";
     /**
      * define the behaviors
      * @return array
@@ -138,96 +137,9 @@ public function actionGenerateAndDownloadDatasetCreationFile() {
     }
     
     
-    /**
-     * Create a provenance from post data with documents Uri associated
-     * [
-     *  provenance : { label, comment, metadata:{ ... } },
-     *  documents : { uri1,uri2}
-     * ]
-     */
-    public function actionCreateProvenanceFromDataset(){
-
-        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
-        $data = Yii::$app->request->post();
-        
-        $documents = [];
-        
-        $provenance = $data["provenance"];
-        if(isset($data["documents"])){
-            $documents = $data["documents"];
-        }
-        $provenanceUri = $this->createProvenance(
-                            $provenance['label'],
-                            $provenance['comment'],
-                            $provenance['sensingDevices'],
-                            $provenance['agents']
-                    );
-        
-        $this->linkDocumentsToProvenance($provenanceUri, $documents);
-        
-        if($provenanceUri != false){
-            return $provenanceUri;
-        }
-        return false;
-    }
     
-    /**
-     * Return an array with provenance list with all characteristics
-     * and provenance label mapped with provenance uri
-     * @return array
-     */
-    public function actionGetProvenancesSelectList(){
-        $token = Yii::$app->session[WSConstants::ACCESS_TOKEN];
-
-        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
-        $provenanceService = new WSProvenanceModel();
-
-        $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
-        
-        foreach ($provenances as $uri => $provenance) {
-            $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
-        }
-        $result['provenances'] = $provenances;
-        $result['provenancesByUri'] = $provenancesArray;
-        return $result;
-    }
     
-    /**
-     * Return an array of variable label mapped with variable uri
-     * @return array
-     */
-    public function actionGetExperimentMesuredVariablesSelectList($experimentUri){
-        
-        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
-        $variables = [];
-        $variables["data"] = [];
-        $experimentVariable = $this->getExperimentMesuredVariablesSelectList($experimentUri);
-        foreach ($experimentVariable as $key => $value) {
-            $variables["data"][] = ["id" => $key, "text" => $value];
-        }
-       
-        return($variables);
-    }
-    
-    /**
-     * Prepare a variable list associated to an experiment
-     * @param string $experimentUri
-     * @return array
-     */
-    private function getExperimentMesuredVariablesSelectList($experimentUri) {
-        if(!isset($experimentUri) || empty($experimentUri)){
-            return [];
-        }
-        $experimentModel = new YiiExperimentModel();
-        $variables = $experimentModel->getMeasuredVariables(
-                Yii::$app->session[WSConstants::ACCESS_TOKEN],
-                $experimentUri
-                );
-        if(isset($variables) && is_array($variables)){
-            return $variables;
-        }
-        return [];
-    }
+   
     
     /**
      * 
@@ -432,7 +344,8 @@ public function actionCreate() {
             unlink($serverFilePath);
 
             //Loaded given variables
-            $experimentVariables = $this->getExperimentMesuredVariablesSelectList($datasetModel->experiment) ;
+            $experimentController = new ExperimentController();
+            $experimentVariables = $experimentController->getExperimentMesuredVariablesSelectList($datasetModel->experiment) ;
             $csvVariables = array_slice($csvHeaders, 2);
             // select all variables that don"t exist in experiment variables
             $variablesNotInExperiment = array_diff($csvVariables, array_values($experimentVariables)); 
@@ -516,82 +429,4 @@ public function actionCreate() {
         }
     }
     
-
-    /**
-     * Create provenance from an alias and a comment
-     * @param type $alias label of the provenance
-     * @param type $comment comment linked to the provenance
-     * @param type $sensingDevice uri of the sensor
-     * @param String $agent uri of the agent
-     * @return boolean
-     */
-    private function createProvenance($alias, $comment,$sensingDevice = null, $agent =null) {
-        $provenanceService = new WSProvenanceModel();
-        $date = new \DateTime();
-        $createdDate = $date->format("Y-m-d\TH:i:sO");
-        $metadata = [
-            "namespaces" => Yii::$app->params[self::PROVENANCE_PARAMS_VALUES],
-            "prov:Agent" =>[
-                "oeso:SensingDevice" => [
-                ],
-                "oeso:Operator" => [
-                ]
-              ],
-            ];
-        if($sensingDevice != null){
-            $metadata["prov:Agent"]["oeso:SensingDevice"] = $sensingDevice;
-        }
-        if($agent != null){
-            $metadata["prov:Agent"]["oeso:Operator"] = $agent;
-        }
-        $provenanceUri = $provenanceService->createProvenance(
-                Yii::$app->session['access_token'],
-                $alias,
-                $comment,
-                $createdDate,
-                $metadata
-        );
-
-        if (is_string($provenanceUri) && $provenanceUri != "token") {
-            return $provenanceUri;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Link list of documents to the given provenance uri
-     * (unlinked -> linked)
-     * @param string $provenanceUri
-     * @param array $documents
-     * @return boolean
-     */
-    private function linkDocumentsToProvenance($provenanceUri, $documents) {
-        $documentModel = new YiiDocumentModel(null, null);
-
-        // associated documents update
-        foreach ($documents as $documentURI) {
-            $documentModel = new YiiDocumentModel(null, null);
-            $documentModel->findByURI(Yii::$app->session['access_token'], $documentURI);
-            $documentModel->status = "linked";
-            $concernedItem = new YiiConcernedItemModel();
-            $concernedItem->uri = $provenanceUri;
-            $concernedItem->rdfType = Yii::$app->params["Provenance"];
-            $documentModel->concernedItems = [$concernedItem];
-            $dataToSend[] = $documentModel->attributesToArray();
-        }
-
-        if (isset($dataToSend)) {
-            $requestRes = $documentModel->update(Yii::$app->session['access_token'], $dataToSend);
-
-            if (is_string($requestRes) && $requestRes === "token") {
-                return false;
-            } else {
-                return true;
-            }
-        } else {
-            return true;
-        }
-    }
-    
 }
diff --git a/controllers/ExperimentController.php b/controllers/ExperimentController.php
index 69944dca..629fb557 100755
--- a/controllers/ExperimentController.php
+++ b/controllers/ExperimentController.php
@@ -404,4 +404,42 @@ public function actionUpdateSensors() {
         
         return json_encode($res, JSON_UNESCAPED_SLASHES);
     }
+    
+    
+     /**
+     * Return an array of variable label mapped with variable uri
+     * @return array
+     */
+    public function actionAjaxGetExperimentMesuredVariablesSelectList($experimentUri){
+        
+        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $variables = [];
+        $variables["data"] = [];
+        $experimentVariable = $this->getExperimentMesuredVariablesSelectList($experimentUri);
+        foreach ($experimentVariable as $key => $value) {
+            $variables["data"][] = ["id" => $key, "text" => $value];
+        }
+       
+        return($variables);
+    }
+    
+    /**
+     * Prepare a variable list associated to an experiment
+     * @param string $experimentUri
+     * @return array
+     */
+    public function getExperimentMesuredVariablesSelectList($experimentUri) {
+        if(!isset($experimentUri) || empty($experimentUri)){
+            return [];
+        }
+        $experimentModel = new YiiExperimentModel();
+        $variables = $experimentModel->getMeasuredVariables(
+                Yii::$app->session[WSConstants::ACCESS_TOKEN],
+                $experimentUri
+                );
+        if(isset($variables) && is_array($variables)){
+            return $variables;
+        }
+        return [];
+    }
 }
diff --git a/controllers/ProvenanceController.php b/controllers/ProvenanceController.php
new file mode 100644
index 00000000..f7d29a84
--- /dev/null
+++ b/controllers/ProvenanceController.php
@@ -0,0 +1,192 @@
+<?php
+namespace app\controllers;
+
+require_once '../config/config.php';
+
+use Yii;
+use yii\filters\VerbFilter;
+use yii\web\Controller;
+use app\models\wsModels\WSProvenanceModel;
+use app\models\yiiModels\YiiDocumentModel;
+use app\models\wsModels\WSConstants;
+use app\models\yiiModels\YiiConcernedItemModel;
+
+/**
+ * CRUD actions for YiiDataModel
+ * 
+ * @see yii\web\Controller
+ * @see app\models\yiiModels\YiiDataModel
+ * @author Arnaud Charleroy <arnaud.charleroy@inra.fr>
+ */
+class ProvenanceController extends Controller {
+    
+    /**
+     * Provenance config namespaces
+     */
+    const PROVENANCE_PARAMS_VALUES = "provenanceNamespaces";
+    
+    
+    /**
+     * Define the behaviors
+     * 
+     * @return array
+     */
+    public function behaviors() {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['POST'],
+                ],
+            ],
+        ];
+    }
+    
+    /**
+     * Create a provenance from post data with documents Uri associated
+     * [
+     *  provenance : { label, comment, metadata:{ ... } },
+     *  documents : { uri1,uri2}
+     * ]
+     */
+    public function actionAjaxCreateProvenanceFromDataset(){
+
+        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $data = Yii::$app->request->post();
+        
+        $documents = [];
+        
+        $provenance = $data["provenance"];
+        if(isset($data["documents"])){
+            $documents = $data["documents"];
+        }
+        $provenanceUri = $this->createProvenance(
+                            $provenance['label'],
+                            $provenance['comment'],
+                            $provenance['sensingDevices'],
+                            $provenance['agents']
+                    );
+        
+        $this->linkDocumentsToProvenance($provenanceUri, $documents);
+        
+        if($provenanceUri != false){
+            return $provenanceUri;
+        }
+        return false;
+    }
+    
+    /**
+     * Return an array with provenance list with all characteristics
+     * and provenance label mapped with provenance uri
+     * @return array
+     */
+    public function actionAjaxGetProvenancesSelectList(){
+        $token = Yii::$app->session[WSConstants::ACCESS_TOKEN];
+
+        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $provenanceService = new WSProvenanceModel();
+
+        $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
+        
+        foreach ($provenances as $uri => $provenance) {
+            $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
+        }
+        $result['provenances'] = $provenances;
+        $result['provenancesByUri'] = $provenancesArray;
+        return $result;
+    }
+    
+    
+    /**
+     * Create provenance from an alias and a comment
+     * @param type $alias label of the provenance
+     * @param type $comment comment linked to the provenance
+     * @param type $sensingDevice uri of the sensor
+     * @param String $agent uri of the agent
+     * @return boolean
+     */
+    private function createProvenance($alias, $comment,$sensingDevice = null, $agent =null) {
+        $provenanceService = new WSProvenanceModel();
+        $date = new \DateTime();
+        $createdDate = $date->format("Y-m-d\TH:i:sO");
+        $metadata = [
+            "namespaces" => Yii::$app->params[self::PROVENANCE_PARAMS_VALUES],
+            "prov:Agent" =>[
+                "oeso:SensingDevice" => [
+                ],
+                "oeso:Operator" => [
+                ]
+              ],
+            ];
+        if($sensingDevice != null){
+            $metadata["prov:Agent"]["oeso:SensingDevice"] = $sensingDevice;
+        }
+        if($agent != null){
+            $metadata["prov:Agent"]["oeso:Operator"] = $agent;
+        }
+        $provenanceUri = $provenanceService->createProvenance(
+                Yii::$app->session['access_token'],
+                $alias,
+                $comment,
+                $createdDate,
+                $metadata
+        );
+
+        if (is_string($provenanceUri) && $provenanceUri != "token") {
+            return $provenanceUri;
+        } else {
+            return false;
+        }
+    }
+    
+    /**
+     * Create an associative array of the provenances objects indexed by their URI
+     * @param type $provenances
+     * @return array
+     */
+    private function mapProvenancesByUri($provenances) {
+        $provenancesMap = [];
+        if ($provenances !== null) {
+            foreach ($provenances as $provenance) {
+                $provenancesMap[$provenance->uri] = $provenance;
+            }
+        }
+
+        return $provenancesMap;
+    }
+    
+     /**
+     * Link list of documents to the given provenance uri
+     * (unlinked -> linked)
+     * @param string $provenanceUri
+     * @param array $documents
+     * @return boolean
+     */
+    private function linkDocumentsToProvenance($provenanceUri, $documents) {
+        $documentModel = new YiiDocumentModel(null, null);
+
+        // associated documents update
+        foreach ($documents as $documentURI) {
+            $documentModel = new YiiDocumentModel(null, null);
+            $documentModel->findByURI(Yii::$app->session['access_token'], $documentURI);
+            $documentModel->status = "linked";
+            $concernedItem = new YiiConcernedItemModel();
+            $concernedItem->uri = $provenanceUri;
+            $concernedItem->rdfType = Yii::$app->params["Provenance"];
+            $documentModel->concernedItems = [$concernedItem];
+            $dataToSend[] = $documentModel->attributesToArray();
+        }
+
+        if (isset($dataToSend)) {
+            $requestRes = $documentModel->update(Yii::$app->session['access_token'], $dataToSend);
+
+            if (is_string($requestRes) && $requestRes === "token") {
+                return false;
+            } else {
+                return true;
+            }
+        } else {
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index 1a4419fa..f58fcac1 100644
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -47,7 +47,7 @@ function populateVariableList(experimentUri){
             settings = window[settings];
             if(experimentUri !== undefined && experimentUri !== null ){
                 $.ajax({
-                    url: '<?= Url::toRoute(['dataset/get-experiment-mesured-variables-select-list']); ?>',
+                    url: '<?= Url::toRoute(['experiment/ajax-get-experiment-mesured-variables-select-list']); ?>',
                     type: 'GET',
                     dataType: 'json',
                     data: {"experimentUri": experimentUri}
@@ -112,7 +112,7 @@ function saveProvenance(){
                 });
                 
                  $.ajax({
-                    url: 'index.php?r=dataset%2Fcreate-provenance-from-dataset',
+                    url: '<?= Url::toRoute(['provenance/ajax-create-provenance-from-dataset']); ?>',
                     type: 'POST',
                     datatype: 'json',
                     data: {provenance :provenance,
@@ -164,7 +164,7 @@ function saveProvenance(){
         
         function loadProvenances(provenanceSelectedUri){
             return $.ajax({
-                    url: 'index.php?r=dataset%2Fget-provenances-select-list',
+                    url: '<?= Url::toRoute(['provenance/ajax-get-provenances-select-list']); ?>',
                     type: 'POST',
                     datatype: 'json'
             });
@@ -245,40 +245,7 @@ function refreshRules(){
                 }
         }
         
-        function saveDocument(){
-            // On save get document form values
-            var formData = new FormData();
-            var file_data = $('#document-content #yiidocumentmodel-file').prop('files')[0];
-            formData.append('file', file_data);
-            var other_data = $('form').serializeArray();
-            $.each(other_data, function (key, input) {
-                formData.append(input.name, input.value);
-            });
-
-            // Send documents form
-            $.ajax({
-                url: 'index.php?r=document%2Fcreate-from-dataset',
-                type: 'POST',
-                processData: false,
-                datatype: 'json',
-                contentType: false,
-                data: formData
-
-            })
-            .done(function (data) {
-                    // Add document URI and close document add form
-                    $('#yiidatasetmodel-documentsuris-documenturi-' + nbDocuments).val(data);
-                    documentUploaded = true;
-                    $('#document-modal').modal('toggle');
-
-            })
-            .fail(function (jqXHR, textStatus) {
-                    // Disaply errors
-                    $('#document-save-msg').parent().removeClass('alert-info');
-                    $('#document-save-msg').parent().addClass('alert-danger');
-                    $('#document-save-msg').html('Request failed: ' + textStatus);
-            });
-        }
+        
     </script>
         <script>
     $(document).ready(function () {
@@ -635,12 +602,8 @@ function saveDocument(){
 
         // Initial document count
         var nbDocuments = -1;
-        $(document).on('click', '#document-save', function () {
-            saveDocument();
-            return false;
-        });
-
-        // Open document add form on click
+        
+          // Open document add form on click
         $('.buttonDocuments').click(function () {
             console.log("click")
             nbDocuments++;
@@ -648,6 +611,43 @@ function saveDocument(){
             $('#document-modal').modal('toggle');
         });
 
+        $(document).on('click', '#document-save', function () {
+            // On save get document form values
+            var formData = new FormData();
+            var file_data = $('#document-content #yiidocumentmodel-file').prop('files')[0];
+            formData.append('file', file_data);
+            var other_data = $('form').serializeArray();
+            $.each(other_data, function (key, input) {
+                formData.append(input.name, input.value);
+            });
+
+            // Send documents form
+            $.ajax({
+                url: '<?= Url::to(['document/create-from-dataset']);?>',
+                type: 'POST',
+                processData: false,
+                datatype: 'json',
+                contentType: false,
+                data: formData
+
+            })
+            .done(function (data) {
+                    // Add document URI and close document add form
+                    $('#yiidatasetmodel-documentsuris-documenturi-' + nbDocuments).val(data);
+                    documentUploaded = true;
+                    $('#document-modal').modal('toggle');
+
+            })
+            .fail(function (jqXHR, textStatus) {
+                    // Disaply errors
+                    $('#document-save-msg').parent().removeClass('alert-info');
+                    $('#document-save-msg').parent().addClass('alert-danger');
+                    $('#document-save-msg').html('Request failed: ' + textStatus);
+            });
+            return false;
+        });
+
+      
         // Download adjusted to variables CSV template file on click
         $(document).on('change', '#uriVariable-selector', function () {
             var variablesLabels = [];
@@ -683,6 +683,8 @@ function saveDocument(){
         // Update provenance fields depending of startup value
         updateProvenanceFields($("#provenance-selector").val());
      });    
+     
+   
     </script>
     <style>
         /* This is a css loader. It's not related to vue-form-wizard */

From 3e1cfbdbab4f03dd1be4cf21a0e5cd3125b9e7ce Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Sun, 15 Dec 2019 20:13:10 +0100
Subject: [PATCH 29/35] Update form

---
 views/dataset/_form.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index f58fcac1..6d3b0eb3 100644
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -275,9 +275,11 @@ function refreshRules(){
         if (isset($errors) && $errors !== null):
     ?>
     <div class="alert alert-danger" >
-        <h3 style="margin:3%;">Errors found in datasensor :</h3>
+        <h3 style="margin:3%;">Errors found in dataset :</h3>
         <ul>
         <?php 
+            $messageLimit = 10;
+            $messageCount = 0;
             // Display error messages
             $errorMessages = [];
             foreach($errors as $error) {
@@ -290,9 +292,14 @@ function refreshRules(){
             
             $errorMessages = array_unique($errorMessages);
             foreach ($errorMessages as $errorMessage) {
-                 echo '<li>' . $errorMessage . '</li>';
+                if($messageCount <= $messageLimit){
+                    echo '<li>' . $errorMessage . '</li>';
+                }elseif($messageCount > $messageLimit){
+                    echo '<li>... other errors are masked</li>';
+                    break;
+                }
+                $messageCount++;
             }
-            
         ?>
         </ul>
     </div>
@@ -538,10 +545,11 @@ function refreshRules(){
              },
              methods: {
                 onComplete: function(){
+                    this.loadingWizard = true;
                     $("#<?= $form->getId() ?>").submit();
                 },
                 setLoading: function(value) {
-                      this.loadingWizard = value
+                      this.loadingWizard = value;
                 },
                 handleValidation: function(isValid, tabIndex){
                       console.log('Tab: '+tabIndex+ ' valid: '+isValid)

From a655e55a3421c7e36111bb66bc2e6949fd7b6176 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Wed, 18 Dec 2019 15:17:09 +0100
Subject: [PATCH 30/35] Update provenance model

---
 controllers/ProvenanceController.php  | 27 +++++++++++++--------------
 models/wsModels/WSProvenanceModel.php |  2 +-
 views/dataset/_form.php               |  7 ++++++-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/controllers/ProvenanceController.php b/controllers/ProvenanceController.php
index f7d29a84..10df2f9c 100644
--- a/controllers/ProvenanceController.php
+++ b/controllers/ProvenanceController.php
@@ -99,31 +99,30 @@ public function actionAjaxGetProvenancesSelectList(){
     
     /**
      * Create provenance from an alias and a comment
-     * @param type $alias label of the provenance
-     * @param type $comment comment linked to the provenance
-     * @param type $sensingDevice uri of the sensor
-     * @param String $agent uri of the agent
+     * @param string $alias label of the provenance
+     * @param string $comment comment linked to the provenance
+     * @param array $sensingDevices uri of the sensor
+     * @param array $agents uri of the agent
      * @return boolean
      */
-    private function createProvenance($alias, $comment,$sensingDevice = null, $agent =null) {
+    private function createProvenance($alias, $comment,$sensingDevices = [], $agents = []) {
         $provenanceService = new WSProvenanceModel();
         $date = new \DateTime();
         $createdDate = $date->format("Y-m-d\TH:i:sO");
         $metadata = [
             "namespaces" => Yii::$app->params[self::PROVENANCE_PARAMS_VALUES],
             "prov:Agent" =>[
-                "oeso:SensingDevice" => [
-                ],
-                "oeso:Operator" => [
-                ]
-              ],
+             ],
+            "prov:Entity" =>[
+             ]
             ];
-        if($sensingDevice != null){
-            $metadata["prov:Agent"]["oeso:SensingDevice"] = $sensingDevice;
+        foreach ($sensingDevices as $sensingDevice) {
+          $metadata["prov:Agent"][] = ["oeso:SensingDevice" => $sensingDevice];
         }
-        if($agent != null){
-            $metadata["prov:Agent"]["oeso:Operator"] = $agent;
+        foreach ($agents as $agent) {
+          $metadata["prov:Agent"][] = ["oeso:Operator" => $agent];
         }
+            
         $provenanceUri = $provenanceService->createProvenance(
                 Yii::$app->session['access_token'],
                 $alias,
diff --git a/models/wsModels/WSProvenanceModel.php b/models/wsModels/WSProvenanceModel.php
index fafc413b..e9a1e88b 100644
--- a/models/wsModels/WSProvenanceModel.php
+++ b/models/wsModels/WSProvenanceModel.php
@@ -48,7 +48,7 @@ public function createProvenance($sessionToken, $label, $comment,$createdDate, $
         ]]);
 
         if (
-                isset($provenance->{WSConstants::METADATA}->{WSConstants::DATA_FILES}) && count($provenance->{WSConstants::METADATA}->{WSConstants::DATA_FILES}) == 1
+            isset($provenance->{WSConstants::METADATA}->{WSConstants::DATA_FILES}) && count($provenance->{WSConstants::METADATA}->{WSConstants::DATA_FILES}) == 1
         ) {
             return $provenance->{WSConstants::METADATA}->{WSConstants::DATA_FILES}[0];
         } else {
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index 6d3b0eb3..cf028776 100644
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -188,7 +188,12 @@ function updateProvenanceFields(uri) {
 
                 // Set provenance provenanceAgents, disable input and remove validation messages 
                 try {
-                    var provenanceAgents = provenances[uri]["metadata"]["prov:Agent"]["oeso:Operator"];
+                    var provenanceAgents = [];
+                    provenances[uri]["metadata"]["prov:Agent"].forEach(function(agentElement){
+                        if(agentElement.hasOwnProperty("oeso:Operator")){
+                            provenanceAgents.push(agentElement["oeso:Operator"]);
+                        }
+                      });
                     $("#yiidatasetmodel-provenanceagents").val(provenanceAgents);
                     $("#yiidatasetmodel-provenanceagents").trigger("change");
                 } catch (error) {

From 30e1ddc6b445d18090e1a67351568227a040e3a2 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Thu, 16 Jan 2020 13:01:17 +0100
Subject: [PATCH 31/35] Add  trim function on csv variables headers

---
 controllers/DatasetController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index d9e5a869..638d58f5 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -346,7 +346,9 @@ public function actionCreate() {
             //Loaded given variables
             $experimentController = new ExperimentController();
             $experimentVariables = $experimentController->getExperimentMesuredVariablesSelectList($datasetModel->experiment) ;
-            $csvVariables = array_slice($csvHeaders, 2);
+            $csvRawVariables = array_slice($csvHeaders, 2);
+            // clean variables name
+            $csvVariables = array_map('trim', $csvRawVariables);
             // select all variables that don"t exist in experiment variables
             $variablesNotInExperiment = array_diff($csvVariables, array_values($experimentVariables)); 
             // Check CSV header with variables

From b4ea0b666f308a7cfb49ca7ac8ebc172926d66ff Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Thu, 27 Feb 2020 15:03:42 +0100
Subject: [PATCH 32/35] Update data by scientific object alias interface - Add
 more information messages - Test documents update

---
 controllers/ProvenanceController.php | 32 +++++++++++++-
 views/dataset/_form.php              | 66 ++++++++++++++++++++++++----
 2 files changed, 88 insertions(+), 10 deletions(-)

diff --git a/controllers/ProvenanceController.php b/controllers/ProvenanceController.php
index 10df2f9c..79f458d9 100644
--- a/controllers/ProvenanceController.php
+++ b/controllers/ProvenanceController.php
@@ -75,6 +75,28 @@ public function actionAjaxCreateProvenanceFromDataset(){
         return false;
     }
     
+    /**
+     * Update provenance documents from post data 
+     * [
+     *  provenance : { label, comment, metadata:{ ... } },
+     *  documents : { uri1,uri2}
+     * ]
+     */
+    public function actionAjaxUpdateProvenanceDocumentsFromDataset(){
+
+        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $data = Yii::$app->request->post();
+        
+        $documents = [];
+        
+        $provenanceUri = $data["provenanceUri"];
+        if(isset($data["documents"])){
+            $documents = $data["documents"];
+        }
+        
+        return $this->linkDocumentsToProvenance($provenanceUri, $documents);
+    }
+    
     /**
      * Return an array with provenance list with all characteristics
      * and provenance label mapped with provenance uri
@@ -117,10 +139,16 @@ private function createProvenance($alias, $comment,$sensingDevices = [], $agents
              ]
             ];
         foreach ($sensingDevices as $sensingDevice) {
-          $metadata["prov:Agent"][] = ["oeso:SensingDevice" => $sensingDevice];
+          $metadata["prov:Agent"][] = [
+              "prov:id" =>  $sensingDevice,
+              "rdf:type" => "oeso:SensingDevice"
+            ];
         }
         foreach ($agents as $agent) {
-          $metadata["prov:Agent"][] = ["oeso:Operator" => $agent];
+          $metadata["prov:Agent"][] = [
+                "prov:id" => $agent,
+                "rdf:type" => "oeso:Operator"
+            ];
         }
             
         $provenanceUri = $provenanceService->createProvenance(
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index cf028776..bfa9edca 100644
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -76,14 +76,38 @@ function populateVariableList(experimentUri){
         }
         
         /**
-         * Save provenance model via ajax
+         * Save provenance model via ajax or update provenance documents
          * @returns {Boolean}         */
-        function saveProvenance(){
+        function saveOrUpdateProvenance(){
 
             var newProvenanceUri = $("#provenance-selector :selected").val();
             
             if(provenances.hasOwnProperty(newProvenanceUri)){
-                  toastr.info("Already existing provenance");
+                var documents = [];
+                var documentsInputList = $("input[id^='yiidatasetmodel-documentsuris-documenturi-']")
+                documentsInputList.each(function (i, documentInput) {
+                    documents.push($(documentInput).val());
+                });
+                if(documents.length > 0){
+                    $.ajax({
+                        url: '<?= Url::toRoute(['provenance/ajax-update-provenance-documents-from-dataset']); ?>',
+                        type: 'POST',
+                        datatype: 'json',
+                        data: {provenanceUri :newProvenanceUri,
+                                documents : documents}
+                    })
+                    .done(function () {
+                        toastr.info("Documents updated");
+                    }).fail(function (jqXHR, textStatus) {
+                        // Disaply errors
+                        $('#document-save-msg').parent().removeClass('alert-info');
+                        $('#document-save-msg').parent().addClass('alert-danger');
+                        $('#document-save-msg').html('Request failed: ' + textStatus);
+                        toastr.error("An error has occured during provenance saving");
+                    });
+                }else{
+                    toastr.warning("No documents added");
+                }
             }
             
             if(!provenances.hasOwnProperty(newProvenanceUri) 
@@ -191,7 +215,7 @@ function updateProvenanceFields(uri) {
                     var provenanceAgents = [];
                     provenances[uri]["metadata"]["prov:Agent"].forEach(function(agentElement){
                         if(agentElement.hasOwnProperty("oeso:Operator")){
-                            provenanceAgents.push(agentElement["oeso:Operator"]);
+                            provenanceAgents.push(agentElement["prov:id"]);
                         }
                       });
                     $("#yiidatasetmodel-provenanceagents").val(provenanceAgents);
@@ -211,6 +235,8 @@ function updateProvenanceFields(uri) {
                 $("#already-linked-documents").load(documentsLoadUri, {
                     "uri": uri
                 });
+                $("#saveProvenanceButton").text("Add provenance documents");
+                $("#saveProvenanceButton").data("status","update");
             } else {
                 // Otherwise clear provenance agents and enable input
                 $("#yiidatasetmodel-provenanceagents").val(agents).removeAttr("disabled").trigger("change");
@@ -220,6 +246,10 @@ function updateProvenanceFields(uri) {
 
                 // Clear linked documents list
                 $("#already-linked-documents").empty();
+                
+                $("#saveProvenanceButton").text("Create provenance");
+                $("#saveProvenanceButton").data("status","create");
+
             }
         }
         
@@ -494,19 +524,21 @@ function refreshRules(){
         ])->label(false)
         ?>
         <br>
-        <?= Html::button(Yii::t('app', 'Create provenance'), ['class' => 'btn btn-success','onclick' => 'saveProvenance()']) ?>
+        <?= Html::button(Yii::t('app', 'Create provenance'), ['class' => 'btn btn-success','onclick' => 'saveOrUpdateProvenance()', 'id' => 'saveProvenanceButton']) ?>
         <br>
         <br>
 
                 </tab-content>
                 <tab-content title="<?= Yii::t('app','Upload dataset'); ?>"
-                             icon="ti-check">
+                             icon="ti-check"
+                             :before-change="beforeUploadData">
                 <h3><i>  <?= Yii::t('app', 'Dataset input file') ?></i></h3>
 
             <?=
             $form->field($model, 'file')->widget(FileInput::classname(), [
                 'options' => [
                     'maxFileSize' => 2000,
+                    'id' => 'dataset-file-uploader',
                     'pluginOptions' => ['allowedFileExtensions' => ['csv'], 'showUpload' => false],
                 ]
             ]);
@@ -543,7 +575,7 @@ function refreshRules(){
     <script>
         $(document).ready(function () {
             Vue.use(VueFormWizard)
-            new Vue({
+            var formVue = new Vue({
              el: '#app',
              data:{
                 loadingWizard: false
@@ -551,6 +583,7 @@ function refreshRules(){
              methods: {
                 onComplete: function(){
                     this.loadingWizard = true;
+                    $("button.wizard-btn").attr('disabled','disabled');
                     $("#<?= $form->getId() ?>").submit();
                 },
                 setLoading: function(value) {
@@ -587,6 +620,22 @@ function refreshRules(){
                                 }   
                               }, 200)
                       });
+                  },
+                  beforeUploadData: function(){
+                      return new Promise((resolve, reject) => {
+                          setTimeout(() => {
+                               console.log($('#dataset-file-uploader').fileinput('getFilesCount'));
+                                var fileCount = $('#dataset-file-uploader').fileinput('getFilesCount');
+                                if(fileCount === 1){
+                                    formVue.loadingWizard = false;
+                                      resolve(true);
+                                }else{
+                                     toastr.warning("You must select a valid data file to continued");
+                                  reject("You must select a valid provenance to continue");
+                                  
+                                }
+                              }, 200)
+                      });
                   }
               }
         });
@@ -692,7 +741,8 @@ function refreshRules(){
         $("#provenance-selector").change(function () {
             updateProvenanceFields($(this).val());
         });
-
+        
+        
         // Update provenance fields depending of startup value
         updateProvenanceFields($("#provenance-selector").val());
      });    

From a44fa229f52d837626f312a918cc8f73d9ced7b2 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Mon, 2 Mar 2020 12:43:33 +0100
Subject: [PATCH 33/35] Add withProperties filter in ScientificObjectSearch

---
 controllers/DatasetController.php           |  3 +--
 models/yiiModels/ScientificObjectSearch.php | 27 ++++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index 638d58f5..b6d74b07 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -19,10 +19,8 @@
 use yii\web\Controller;
 use yii\web\UploadedFile;
 use yii\filters\VerbFilter;
-use app\models\yiiModels\YiiDocumentModel;
 use app\models\wsModels\WSProvenanceModel;
 use app\models\wsModels\WSDataModel;
-use app\models\yiiModels\YiiConcernedItemModel;
 use openSILEX\handsontablePHP\adapter\HandsontableSimple;
 use openSILEX\handsontablePHP\classes\ColumnConfig;
 use app\models\wsModels\WSConstants;
@@ -357,6 +355,7 @@ public function actionCreate() {
                     $SciencitificObjectSearch = new \app\models\yiiModels\ScientificObjectSearch();
                     $SciencitificObjectSearch->experiment = $datasetModel->experiment;
                     $SciencitificObjectSearch->pageSize = 30000;
+                    $SciencitificObjectSearch->setWithProperties(false);
                     $SciencitificObjectSearchResults = $SciencitificObjectSearch->search($token);
 
                     $objectUris = [];
diff --git a/models/yiiModels/ScientificObjectSearch.php b/models/yiiModels/ScientificObjectSearch.php
index 478694c4..2aa620c6 100755
--- a/models/yiiModels/ScientificObjectSearch.php
+++ b/models/yiiModels/ScientificObjectSearch.php
@@ -27,6 +27,8 @@ class ScientificObjectSearch extends YiiScientificObjectModel {
     //create a trait (?) with methods search and jsonListOfArray and use it in 
     //each class ElementNameSearch
     //\SILEX:refactor
+    private $withProperties;
+    const WITH_PROPERTIES = "withProperties";
     
     /**
      * @inheritdoc
@@ -34,7 +36,7 @@ class ScientificObjectSearch extends YiiScientificObjectModel {
     public function rules()
     {
         return [
-            [['uri', 'label', 'experiment', 'alias', 'type'], 'safe'],
+            [['uri', 'label', 'experiment', 'alias', 'type', 'withProperties'], 'safe'],
         ];
     }
     
@@ -82,4 +84,27 @@ public function search($sessionToken, $params) {
             ]);
         }
     }
+    
+    function getWithProperties() {
+        return $this->withProperties;
+    }
+
+    function setWithProperties($withProperties) {
+        if(is_bool($withProperties)){
+            $this->withProperties = $withProperties;
+        }else{
+            $this->withProperties = true;
+        }
+    }
+    
+    /**
+     * Add with properties parameters
+     * @return array
+     */
+    public function attributesToArray() {
+        $elementForWebService = parent::attributesToArray();
+        $elementForWebService[ScientificObjectSearch::WITH_PROPERTIES] = $this->getWithProperties(); 
+        
+        return $elementForWebService;
+    }
 }
\ No newline at end of file

From f0d236a39a5c51f7cc17afb21fc9072554000042 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Mon, 2 Mar 2020 13:13:35 +0100
Subject: [PATCH 34/35] Reload agents

---
 views/dataset/_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index bfa9edca..7eab2db4 100644
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -214,7 +214,7 @@ function updateProvenanceFields(uri) {
                 try {
                     var provenanceAgents = [];
                     provenances[uri]["metadata"]["prov:Agent"].forEach(function(agentElement){
-                        if(agentElement.hasOwnProperty("oeso:Operator")){
+                        if(agentElement.hasOwnProperty("rdf:type") && agentElement["rdf:type"] === "oeso:Operator"){
                             provenanceAgents.push(agentElement["prov:id"]);
                         }
                       });

From 813d7998d48d674f19b95d60953c5f5efc384fc6 Mon Sep 17 00:00:00 2001
From: Arnaud Charleroy <arnaud.charleroy@inra.fr>
Date: Tue, 10 Mar 2020 11:28:34 +0100
Subject: [PATCH 35/35] Update

---
 controllers/DatasetController.php     | 10 +---
 controllers/ProvenanceController.php  | 22 +++----
 models/wsModels/WSProvenanceModel.php |  3 +
 views/dataset/_form.php               | 85 +++++++++++++++++++--------
 4 files changed, 73 insertions(+), 47 deletions(-)

diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index b6d74b07..be4c223a 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -123,15 +123,9 @@ public function actionGenerateAndDownloadDatasetCreationFile() {
         foreach ($variables as $variableAlias) {
             $fileColumns[] = $variableAlias;
         }
-
-        $csvPath = "coma";
-        if (Yii::$app->params['csvSeparator'] == ";") {
-            $csvPath = "semicolon";
-        }
         
-        $file = fopen('./documents/DatasetFiles/' . $csvPath . '/datasetTemplate.csv', 'w');
-        fputcsv($file, $fileColumns, $delimiter = Yii::$app->params['csvSeparator']);
-        fclose($file);
+        $csvString = implode(Yii::$app->params['csvSeparator'], $fileColumns); 
+        return json_encode($csvString);
     }
     
     
diff --git a/controllers/ProvenanceController.php b/controllers/ProvenanceController.php
index 79f458d9..1baeec5b 100644
--- a/controllers/ProvenanceController.php
+++ b/controllers/ProvenanceController.php
@@ -20,12 +20,6 @@
  */
 class ProvenanceController extends Controller {
     
-    /**
-     * Provenance config namespaces
-     */
-    const PROVENANCE_PARAMS_VALUES = "provenanceNamespaces";
-    
-    
     /**
      * Define the behaviors
      * 
@@ -131,21 +125,21 @@ private function createProvenance($alias, $comment,$sensingDevices = [], $agents
         $provenanceService = new WSProvenanceModel();
         $date = new \DateTime();
         $createdDate = $date->format("Y-m-d\TH:i:sO");
-        $metadata = [
-            "namespaces" => Yii::$app->params[self::PROVENANCE_PARAMS_VALUES],
-            "prov:Agent" =>[
-             ],
-            "prov:Entity" =>[
-             ]
-            ];
+        $metadata = [];
         foreach ($sensingDevices as $sensingDevice) {
+            if(!isset($metadata["prov:Agent"])){
+                $metadata["prov:Agent"] = [];
+            }
           $metadata["prov:Agent"][] = [
               "prov:id" =>  $sensingDevice,
               "rdf:type" => "oeso:SensingDevice"
             ];
         }
         foreach ($agents as $agent) {
-          $metadata["prov:Agent"][] = [
+            if(!isset($metadata["prov:Agent"])){
+                $metadata["prov:Agent"] = [];
+            }
+            $metadata["prov:Agent"][] = [
                 "prov:id" => $agent,
                 "rdf:type" => "oeso:Operator"
             ];
diff --git a/models/wsModels/WSProvenanceModel.php b/models/wsModels/WSProvenanceModel.php
index e9a1e88b..a64b5aa9 100644
--- a/models/wsModels/WSProvenanceModel.php
+++ b/models/wsModels/WSProvenanceModel.php
@@ -40,6 +40,9 @@ public function __construct() {
      */
     public function createProvenance($sessionToken, $label, $comment,$createdDate, $metadata) {
         $subService = "/";
+        if(empty($metadata)){
+            $metadata = (object) array();
+        }
         $provenance = $this->post($sessionToken, $subService, [[
         "label" => $label,
         "comment" => $comment,
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
index 7eab2db4..f1cd99c1 100644
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -280,6 +280,28 @@ function refreshRules(){
                 }
         }
         
+        // The download function takes a CSV string, the filename and mimeType as parameters
+        // Scroll/look down at the bottom of this snippet to see how download is called
+        function download(content, fileName, mimeType) {
+          var a = document.createElement('a');
+          mimeType = mimeType || 'application/octet-stream';
+
+          if (navigator.msSaveBlob) { // IE10
+            navigator.msSaveBlob(new Blob([content], {
+              type: mimeType
+            }), fileName);
+          } else if (URL && 'download' in a) { //html5 A[download]
+            a.href = URL.createObjectURL(new Blob([content], {
+              type: mimeType
+            }));
+            a.setAttribute('download', fileName);
+            document.body.appendChild(a);
+            a.click();
+            document.body.removeChild(a);
+          } else {
+            location.href = 'data:application/octet-stream,' + encodeURIComponent(content); // only this mime type is supported
+          }
+        }
         
     </script>
         <script>
@@ -291,6 +313,8 @@ function refreshRules(){
         }
         // Inject URI to get document widget linked to an URI
         echo 'documentsLoadUri = "' . Url::to(['document/get-documents-widget']) . '";';
+         // Inject provenances list indexed by URI
+        echo 'experiments = ' . json_encode($this->params['experiments']) . ';';
         // Inject provenances list indexed by URI
         echo 'provenances = ' . json_encode($this->params['provenances']) . ';';
         // Inject sensingDevices list indexed by URI
@@ -458,9 +482,12 @@ function refreshRules(){
                     </div>               
                     
         <?= 
-        Html::a("<button type='button' class='btn btn-success'> " . Yii::t('app', 'Download Template') . "</button>",
-            \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetTemplate.csv',
-            ['id' => 'downloadDatasetTemplate']
+        Html::button(
+                Yii::t('app', 'Download Template'),
+                [
+                'id' => 'downloadDatasetTemplate',
+                'class' => 'btn btn-success'  
+                ]
         );
         ?>
                 <br><br>
@@ -469,7 +496,7 @@ function refreshRules(){
                                  icon="ti-settings"
                                  :before-change="beforeUploadDataset">
                        <h4><?= Yii::t('app', 'Provenance'); ?></h4>
-                <p class="alert alert-info"><?= Yii::t('app/messages', 'To create a new provenance, write the provenance label in the research field and press `Enter`'); ?></p>
+                <p class="alert alert-info"><?= Yii::t('app/messages', 'To create a new provenance, write the provenance label in the research field and press `Enter`. After you will be able to fill provenance input fields and create it by press `Create provenance` button.'); ?></p>
     
         <?=
         $form->field($model, 'provenanceUri')->widget(\kartik\select2\Select2::classname(), [
@@ -583,8 +610,8 @@ function refreshRules(){
              methods: {
                 onComplete: function(){
                     this.loadingWizard = true;
-                    $("button.wizard-btn").attr('disabled','disabled');
                     $("#<?= $form->getId() ?>").submit();
+                    $("button.wizard-btn").attr('disabled','disabled');
                 },
                 setLoading: function(value) {
                       this.loadingWizard = value;
@@ -596,9 +623,10 @@ function refreshRules(){
                       return new Promise((resolve, reject) => {
                           setTimeout(() => {
                               let experimentUri = $("#experiment-selector").val();
-                              if(experimentUri === undefined || experimentUri === null || experimentUri === "" ){
-                                  toastr.warning("You must select a valid experiment to continued");
-                                  reject("You must select a valid experiment to continue");
+                              
+                              if(experimentUri === undefined || experimentUri === null || experimentUri === ""|| !experiments.hasOwnProperty(experimentUri)){
+                                  toastr.warning("You must select a valid experiment to be able to continue");
+                                  reject("You must select a valid experiment to be able to continue");
                               }else{
                                  resolve(true);
                                 }   
@@ -613,7 +641,7 @@ function refreshRules(){
                                       provenanceUri === null ||
                                       provenanceUri === "" ||
                                       !provenances.hasOwnProperty(provenanceUri)){
-                                  toastr.warning("You must select a valid provenance to continued");
+                                  toastr.warning("You must select a valid provenance to be able to continue");
                                   reject("You must select a valid provenance to continue");
                               }else{
                                  resolve(true);
@@ -630,7 +658,7 @@ function refreshRules(){
                                     formVue.loadingWizard = false;
                                       resolve(true);
                                 }else{
-                                     toastr.warning("You must select a valid data file to continued");
+                                     toastr.warning("You must select a valid data file to be able to continue");
                                   reject("You must select a valid provenance to continue");
                                   
                                 }
@@ -711,31 +739,38 @@ function refreshRules(){
 
       
         // Download adjusted to variables CSV template file on click
-        $(document).on('change', '#uriVariable-selector', function () {
+        $(document).on('click', '#downloadDatasetTemplate', function (event) {
+            event.preventDefault();
             var variablesLabels = [];
             $("#uriVariable-selector :selected").each(function (i, sel) {
                 variablesLabels.push($(sel).text());
             });
-            $.ajax({
-                url: 'index.php?r=dataset%2Fgenerate-and-download-dataset-creation-file',
-                type: 'POST',
-                datatype: 'json',
-                data: {variables: variablesLabels}
-            })
-            .done(function (data) {
-            })
-            .fail(function (jqXHR, textStatus) {
-                $('#document-save-msg').parent().removeClass('alert-info');
-                $('#document-save-msg').parent().addClass('alert-danger');
-                $('#document-save-msg').html('Request failed: ' + textStatus);
-            });
+            if(variablesLabels.length > 0){
+                $.ajax({
+                    url: 'index.php?r=dataset%2Fgenerate-and-download-dataset-creation-file',
+                    type: 'POST',
+                    datatype: 'json',
+                    data: {variables: variablesLabels}
+                })
+                .done(function (csvContent) {
+                    console.log(csvContent);
+                    download(csvContent, 'datasetTemplate.csv', 'text/csv;encoding:utf-8');
+                })
+                .fail(function (jqXHR, textStatus) {
+                    $('#document-save-msg').parent().removeClass('alert-info');
+                    $('#document-save-msg').parent().addClass('alert-danger');
+                    $('#document-save-msg').html('Request failed: ' + textStatus);
+                });
+            }else{
+                toastr.warning("You must selected at least one variable");
+            }
         });
         
         // On provenance change update provenance fields
         $("#experiment-selector").change(function () {
              populateVariableList($(this).val());
         });
-         populateVariableList($("#experiment-selector").val());
+        populateVariableList($("#experiment-selector").val());
         
         // On provenance change update provenance fields
         $("#provenance-selector").change(function () {