From 14abf16b18547bd663feed90fa541aa96940dd1e Mon Sep 17 00:00:00 2001 From: jbonnefont Date: Fri, 27 Sep 2019 16:04:14 +0200 Subject: [PATCH 01/23] change highcharts to highstock- get the events from WS - events on the graphic- change a bug logout on actionView/YiiEventModel only --- controllers/EventController.php | 164 +++++++++--------- controllers/ScientificObjectController.php | 61 ++++--- models/yiiModels/EventCreation.php | 5 - models/yiiModels/YiiEventModel.php | 7 +- .../scientific-object/data_visualization.php | 103 ++++++++++- web/css/site.css | 70 ++++---- 6 files changed, 259 insertions(+), 151 deletions(-) diff --git a/controllers/EventController.php b/controllers/EventController.php index 07dc0baf..3b6ed9da 100644 --- a/controllers/EventController.php +++ b/controllers/EventController.php @@ -1,4 +1,5 @@ */ -class EventController extends GenericController { - +class EventController extends GenericController { + const PARAM_ANNOTATIONS_DATA_PROVIDER = "paramAnnotations"; const PARAM_UPDATABLE = "paramUpdatable"; - const ANNOTATIONS_PAGE = "annotations-page"; const INFRASTRUCTURES_DATA = "infrastructures"; const INFRASTRUCTURES_DATA_URI = "infrastructureUri"; const INFRASTRUCTURES_DATA_LABEL = "infrastructureLabel"; const INFRASTRUCTURES_DATA_TYPE = "infrastructureType"; const EVENT_TYPES = "eventTypes"; - const SENSORS_DATA = "sensors"; const SENSOR_DATA_URI = "sensorUri"; const SENSOR_DATA_LABEL = "sensorLabel"; const SENSOR_DATA_TYPE = "sensorType"; - const PARAM_CONCERNED_ITEMS_URIS = 'concernedItemsUris'; const TYPE = 'type'; const PARAM_RETURN_URL = "returnUrl"; @@ -52,35 +51,35 @@ class EventController extends GenericController { * @var string */ public $returnUrl; - + /** * Lists the events. * @return mixed */ public function actionIndex() { $searchModel = new EventSearch(); - + $searchParams = Yii::$app->request->queryParams; - + if (isset($searchParams[WSConstants::PAGE])) { $searchParams[WSConstants::PAGE] = $searchParams[WSConstants::PAGE] - 1; } $searchParams[WSConstants::PAGE_SIZE] = Yii::$app->params['indexPageSize']; - + $searchResult = $searchModel->search(Yii::$app->session[WSConstants::ACCESS_TOKEN], $searchParams); - + if (is_string($searchResult)) { if ($searchResult === WSConstants::TOKEN_INVALID) { return $this->redirect(Yii::$app->urlManager->createUrl(SiteMessages::SITE_LOGIN_PAGE_ROUTE)); } else { return $this->render(SiteMessages::SITE_ERROR_PAGE_ROUTE, [ - SiteMessages::SITE_PAGE_NAME => SiteMessages::INTERNAL_ERROR, - SiteMessages::SITE_PAGE_MESSAGE => $searchResult]); + SiteMessages::SITE_PAGE_NAME => SiteMessages::INTERNAL_ERROR, + SiteMessages::SITE_PAGE_MESSAGE => $searchResult]); } } else { return $this->render('index', [ - 'searchModel' => $searchModel, - 'dataProvider' => $searchResult]); + 'searchModel' => $searchModel, + 'dataProvider' => $searchResult]); } } @@ -92,51 +91,56 @@ public function actionIndex() { public function actionView($id) { // Get request parameters $searchParams = Yii::$app->request->queryParams; - + // Get event $event = (new YiiEventModel())->getEvent(Yii::$app->session[WSConstants::ACCESS_TOKEN], $id); - - // Get documents - $searchDocumentModel = new DocumentSearch(); - $searchDocumentModel->concernedItemFilter = $id; - $documentProvider = $searchDocumentModel->search( - Yii::$app->session[WSConstants::ACCESS_TOKEN], - [YiiEventModel::CONCERNED_ITEMS => $id]); - - // Get annotations - $annotationProvider = $event->getEventAnnotations(Yii::$app->session[WSConstants::ACCESS_TOKEN], $searchParams); - $annotationProvider->pagination->pageParam = self::ANNOTATIONS_PAGE; - - // Render the view of the event - if (is_array($event) && isset($event[WSConstants::TOKEN_INVALID])) { - return redirectToLoginPage(); + if (is_string($event)) { + if ($event === \app\models\wsModels\WSConstants::TOKEN_INVALID) { + return $this->redirect(Yii::$app->urlManager->createUrl("site/login")); + } else { + return $this->render('/site/error', [ + 'name' => Yii::t('app/messages', 'Internal error'), + 'message' => $event]); + } } else { + + // Get documents + $searchDocumentModel = new DocumentSearch(); + $searchDocumentModel->concernedItemFilter = $id; + $documentProvider = $searchDocumentModel->search( + Yii::$app->session[WSConstants::ACCESS_TOKEN], [YiiEventModel::CONCERNED_ITEMS => $id]); + + // Get annotations + $annotationProvider = $event->getEventAnnotations(Yii::$app->session[WSConstants::ACCESS_TOKEN], $searchParams); + $annotationProvider->pagination->pageParam = self::ANNOTATIONS_PAGE; + + // Render the view of the event + return $this->render('view', [ - 'model' => $event, - 'dataDocumentsProvider' => $documentProvider, - self::PARAM_ANNOTATIONS_DATA_PROVIDER => $annotationProvider, - self::PARAM_UPDATABLE => !$this->hasUnupdatableProperties($event) + 'model' => $event, + 'dataDocumentsProvider' => $documentProvider, + self::PARAM_ANNOTATIONS_DATA_PROVIDER => $annotationProvider, + self::PARAM_UPDATABLE => !$this->hasUnupdatableProperties($event) ]); } } - - private function hasUnupdatableProperties($eventAction) : bool { - foreach($eventAction->properties as $property) { - if($property->relation !== Yii::$app->params['from'] - && $property->relation !== Yii::$app->params['to']) { + + private function hasUnupdatableProperties($eventAction): bool { + foreach ($eventAction->properties as $property) { + if ($property->relation !== Yii::$app->params['from'] && $property->relation !== Yii::$app->params['to']) { return true; } } return false; } - + /** * Gets the event types URIs. * @return event types URIs */ public function getSensorTypes() { $model = new \app\models\yiiModels\YiiSensorModel(); - + $sensorsTypes = []; $model->page = 0; $model->pageSize = Yii::$app->params['webServicePageSizeMax']; @@ -148,17 +152,17 @@ public function getSensorTypes() { $sensorsTypes[$sensorType->uri] = $sensorType->uri; } } - + return $sensorsTypes; } - + /** * Gets the event types URIs. * @return event types URIs */ public function getEventsTypes() { $model = new YiiEventModel(); - + $eventsTypes = []; $model->page = 0; $model->pageSize = Yii::$app->params['webServicePageSizeMax']; @@ -170,10 +174,10 @@ public function getEventsTypes() { $eventsTypes[$eventType->uri] = $eventType->uri; } } - + return $eventsTypes; } - + /** * Gets all infrastructures. * @return experiments @@ -187,18 +191,17 @@ public function getInfrastructuresUrisTypesLabels() { return WSConstants::TOKEN_INVALID; } else { foreach ($infrastructures->models as $infrastructure) { - $infrastructuresUrisTypesLabels[] = - [ - self::INFRASTRUCTURES_DATA_URI => $infrastructure->uri, - self::INFRASTRUCTURES_DATA_LABEL => $infrastructure->label, - self::INFRASTRUCTURES_DATA_TYPE => $infrastructure->rdfType - ]; + $infrastructuresUrisTypesLabels[] = [ + self::INFRASTRUCTURES_DATA_URI => $infrastructure->uri, + self::INFRASTRUCTURES_DATA_LABEL => $infrastructure->label, + self::INFRASTRUCTURES_DATA_TYPE => $infrastructure->rdfType + ]; } } - + return $infrastructuresUrisTypesLabels; } - + /** * Gets all sensors. * @return sensors @@ -213,18 +216,17 @@ public function getSensorsUrisTypesLabels() { 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 - ]; + $sensorsUrisTypesLabels[] = [ + self::SENSOR_DATA_URI => $sensor->uri, + self::SENSOR_DATA_LABEL => $sensor->label, + self::SENSOR_DATA_TYPE => $sensor->rdfType + ]; } } - + return $sensorsUrisTypesLabels; } - + /** * Displays the form to create an event or creates it in case of form submission. * @return mixed redirect in case of error or after successfully create @@ -234,21 +236,21 @@ public function actionCreate() { $sessionToken = Yii::$app->session[WSConstants::ACCESS_TOKEN]; $event = new EventCreation(); $event->isNewRecord = true; - + // Display form if (!$event->load(Yii::$app->request->post())) { $event->load(Yii::$app->request->get(), ''); - if(Yii::$app->request->get()['type'] === "scientific-objects"){ - $event->load(array(self::PARAM_CONCERNED_ITEMS_URIS =>array_keys(Yii::$app->session['scientific-object'])),''); + if (Yii::$app->request->get()['type'] === "scientific-objects") { + $event->load(array(self::PARAM_CONCERNED_ITEMS_URIS => array_keys(Yii::$app->session['scientific-object'])), ''); } $event->creator = $this->getCreatorUri($sessionToken); $this->loadFormParams(); - return $this->render('create', ['model' => $event]); - - // Submit form - } else { - $dataToSend[] = $event->attributesToArray(); - $requestResults = $event->insert($sessionToken, $dataToSend); + return $this->render('create', ['model' => $event]); + + // Submit form + } else { + $dataToSend[] = $event->attributesToArray(); + $requestResults = $event->insert($sessionToken, $dataToSend); return $this->handlePostPutResponse($requestResults, $event->returnUrl); } } @@ -262,21 +264,21 @@ public function actionUpdate($id) { $sessionToken = Yii::$app->session[WSConstants::ACCESS_TOKEN]; $event = new EventUpdate(); $event->isNewRecord = false; - + // Display form if (!$event->load(Yii::$app->request->post())) { $event = $event->getEvent($sessionToken, $id); $this->loadFormParams(); - return $this->render('update', ['model' => $event]); - - // Submit form + return $this->render('update', ['model' => $event]); + + // Submit form } else { - $dataToSend[] = $event->attributesToArray(); - $requestResults = $event->update($sessionToken, $dataToSend); - return $this->handlePostPutResponse($requestResults, ['view', 'id' => $event->uri]); + $dataToSend[] = $event->attributesToArray(); + $requestResults = $event->update($sessionToken, $dataToSend); + return $this->handlePostPutResponse($requestResults, ['view', 'id' => $event->uri]); } } - + /** * Loads params used by the forms (creation or update). */ @@ -284,9 +286,8 @@ private function loadFormParams() { $this->view->params[self::EVENT_TYPES] = $this->getEventsTypes(); $this->view->params[self::INFRASTRUCTURES_DATA] = $this->getInfrastructuresUrisTypesLabels(); $this->view->params[self::SENSORS_DATA] = $this->getSensorsUrisTypesLabels(); - } - + /** * Gets the creator of an event. */ @@ -295,4 +296,5 @@ private function getCreatorUri($sessionToken) { $userModel->findByEmail($sessionToken, Yii::$app->session['email']); return $userModel->uri; } + } diff --git a/controllers/ScientificObjectController.php b/controllers/ScientificObjectController.php index 0959c6a2..e50c2764 100755 --- a/controllers/ScientificObjectController.php +++ b/controllers/ScientificObjectController.php @@ -20,6 +20,7 @@ use app\models\yiiModels\YiiScientificObjectModel; use app\models\yiiModels\ScientificObjectSearch; use app\models\yiiModels\YiiExperimentModel; +use app\models\yiiModels\EventSearch; require_once '../config/config.php'; @@ -426,9 +427,9 @@ public function actionCreateMultipleScientificObjects() { $cpt = 0; $insertionResult = $scientificObjectModel->insert($sessionToken, $forWebService); - + $forWebService = []; - + if ($insertionResult->{\app\models\wsModels\WSConstants::METADATA}->status[0]->exception->type != "Error") { foreach ($insertionResult->{\app\models\wsModels\WSConstants::METADATA}->{\app\models\wsModels\WSConstants::DATA_FILES} as $scientificObjectUri) { $return["objectUris"][] = $scientificObjectUri; @@ -808,13 +809,13 @@ public function actionDownloadCsv() { } else { $wktGeometry = ""; } - - $stringToWrite .= $model->uri . Yii::$app->params['csvSeparator'] . - $model->label . Yii::$app->params['csvSeparator'] . - $model->rdfType . Yii::$app->params['csvSeparator'] . - $model->experiment . Yii::$app->params['csvSeparator'] . - '"' . $wktGeometry . '"' . Yii::$app->params['csvSeparator'] . - "\n"; + + $stringToWrite .= $model->uri . Yii::$app->params['csvSeparator'] . + $model->label . Yii::$app->params['csvSeparator'] . + $model->rdfType . Yii::$app->params['csvSeparator'] . + $model->experiment . Yii::$app->params['csvSeparator'] . + '"' . $wktGeometry . '"' . Yii::$app->params['csvSeparator'] . + "\n"; } $totalPage = intval($searchModel->totalPages); @@ -959,14 +960,14 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { * e.g : * { * "variable": "http:\/\/www.opensilex.org\/demo\/id\/variable\/v0000001", - * "scientificObjectData": [ - * "label": "Scientific object label", - * "dataFromProvenance": [ - * "provenance":"Data provenance uri", - * "data": ["1,874809","2015-02-10"], - * ["2,313261","2015-03-15"],.. - * ] - * ] + * "scientificObjectData":{ + * "label": "Scientific object label", + * "dataFromProvenance":{ + * "ProvenanceUri1": [["1,874809","2015-02-10"],..], + * "ProvenanceUri2": [["2,313261","2015-03-15"],..], + * ... + * } + * } * } */ @@ -995,10 +996,24 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { if (!empty($data)) { $toReturn["variable"] = $searchModel->variable; $scientificObjectData["dataFromProvenance"] = $dataByProvenance; - $toReturn["scientificObjectData"][] = $scientificObjectData; + $toReturn["scientificObjectData"] = $scientificObjectData; } - + //Get the events associate to the sci. obj. to put on the Highcharts Graph + $searchModel = null; + $searchModel = new EventSearch(); + $searchModel->pageSize = 800; + $searchModel->searchConcernedItemUri = $uri; + $searchResult = $searchModel->search($token, null); + $events = array(); + + foreach ($searchResult->getModels() as $model) { + $events[] = [ + 'date' =>(strtotime($model->date)) * 1000, + 'title' => explode('#',$model->rdfType)[1], + 'text' => $model->uri + ]; + } //on FORM submitted: //check if image visualization is activated @@ -1008,7 +1023,7 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { $selectedProvenance = isset($_POST['provenances']) ? $_POST['provenances'] : null; if (isset($_POST['filter']) && $_POST['filter'] !== "") { $selectedPositionIndex = $_POST['filter']; - $attribut=explode(":",Yii::$app->params['image.filter']['metadata.position'][$selectedPositionIndex]); + $attribut = explode(":", Yii::$app->params['image.filter']['metadata.position'][$selectedPositionIndex]); $filterToSend = "{'metadata." . $attribut[0] . "':'" . $attribut[1] . "'}"; } return $this->render('data_visualization', [ @@ -1016,14 +1031,14 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { 'variables' => $variables, 'data' => $toReturn, 'show' => $show, - 'dateStart' => $searchModel->startDate, - 'dateEnd' => $searchModel->endDate, + 'dateStart' => $_POST['dateStart'], + 'dateEnd' => $_POST['dateEnd'], 'selectedVariable' => $selectedVariable, 'imageTypeSelected' => $imageTypeSelected, 'selectedProvenance' => $selectedProvenance, 'selectedPosition' => $selectedPositionIndex, // seems that select widget use index when they are selectable number values 'filterToSend' => $filterToSend, - 'test' => $selectedPosition, + 'events' => $events, ]); } else { //If there is no variable given, just redirect to the visualization page. return $this->render('data_visualization', [ diff --git a/models/yiiModels/EventCreation.php b/models/yiiModels/EventCreation.php index 8c91b3a8..ffcfd18b 100644 --- a/models/yiiModels/EventCreation.php +++ b/models/yiiModels/EventCreation.php @@ -32,11 +32,6 @@ class EventCreation extends EventAction { public $creator; const CREATOR = 'creator'; - /** - * To kind of object ? Vector, sensor, scientific object (link to the cart functionnality) - * proposition name: target/ category .. - */ - public $category; /** * @inheritdoc */ diff --git a/models/yiiModels/YiiEventModel.php b/models/yiiModels/YiiEventModel.php index 947219f6..57468830 100644 --- a/models/yiiModels/YiiEventModel.php +++ b/models/yiiModels/YiiEventModel.php @@ -140,9 +140,10 @@ protected function arrayToAttributes($array) { public function getEvent($sessionToken, $uri) { $event = $this->wsModel->getEvent($sessionToken, $uri); if (!is_string($event)) { - if (isset($event[WSConstants::TOKEN_INVALID])) { - return $event; - } else { + if (isset($event->{'metadata'}->{'status'}[0]->{'exception'}->{'details'}) + && $event->{'metadata'}->{'status'}[0]->{'exception'}->{'details'} === \app\models\wsModels\WSConstants::TOKEN_INVALID) { + return \app\models\wsModels\WSConstants::TOKEN_INVALID; + } else { $this->arrayToAttributes($event); $this->uri = $uri; return $this; diff --git a/views/scientific-object/data_visualization.php b/views/scientific-object/data_visualization.php index 193a1870..2a45dc8c 100644 --- a/views/scientific-object/data_visualization.php +++ b/views/scientific-object/data_visualization.php @@ -11,6 +11,7 @@ use yii\widgets\ActiveForm; use yii\helpers\Html; use miloschuman\highcharts\Highcharts; +use miloschuman\highcharts\Highstock; use yii\web\JsExpression; use yii\helpers\Url; @@ -27,7 +28,6 @@ ?>
-

-

".Yii::t('app/messages', 'You have to click a graphic point to see images on that date.')."

"; +

" . Yii::t('app/messages', 'You have to click a graphic point to see images on that date.') . "

"; } ?> @@ -248,15 +248,100 @@ if (empty($data)) { echo "

" . Yii::t('app/messages', 'No result found.') . "

"; } else { + + /** + * @var series (before) + * @example + * [ + * [ + * 'name'=>'provenance 1', + * 'data'=>[[],[],[],...] + * ], + * [ 'name'=>'provenance 2', + * 'data'=>[[],[],[],...] + * ], + * + * ] + */ + /** + * @var series (now) + * @example + * [ + * [ + * 'type'=> 'line', + * 'name'=> 'provenance 1', + * 'id'=> 'provenance 1', + * 'data'=>[[1492139471018, 1569],[],[],...], + * 'visible':true, + * 'marker':[ + * 'enabled' :true, + * 'radius' :3 + * ] + * ], + * [ + * 'type'=> 'line', + * 'name'=> 'provenance 2', + * 'id'=> 'provenance 2', + * 'data'=>[[1492139471018, 2769],[],[],...], + * 'visible':true, + * 'marker':[ + * 'enabled' :true, + * 'radius' :3 + * ] + * ],[....], + * [ + * 'type'=> 'flags', + * 'name'=> 'event' + * 'data'=>[ + * [ + * 'x'=>1492139471018, + * 'title'=>'irrigation', + * 'text'=>'http://www.opensilex.org/id/event/f45d3221-104d-4ff2-ad8e-917e99970e05' + * ], + * [ + * ],.. + * ], + * 'lineWidth'=>1, + * 'y'=>-50, + * 'events'=> [ + * 'click'=>new JsExpression("function(event) {}") + * ] + * ] + * ] + */ $series = []; - foreach ($data["scientificObjectData"][0]["dataFromProvenance"]as $dataFromProvenanceKey => $dataFromProvenanceValue) { - $series[] = ['name' => $dataFromProvenanceKey, - 'data' => $dataFromProvenanceValue]; + foreach ($data["scientificObjectData"]["dataFromProvenance"]as $dataFromProvenanceKey => $dataFromProvenanceValue) { + $series[] = [ + 'type' => 'line', + 'name' => $dataFromProvenanceKey, + 'data' => $dataFromProvenanceValue + ]; + } + + foreach ($events as $event) { + $Eventsdata[] = [ + 'x' => $event['date'], + 'title' => $event['title'], + 'text' => $event['text'] + ]; } + + $eventsTab[] = [ + 'type' => 'flags', + 'name' => 'Events', + 'lineWidth' => 1, + 'y' => -50, + 'data' => $Eventsdata + ]; + + $series[] = $eventsTab[0]; + //var_dump($series); + + $url2 = Url::to(['image/search-from-scientific-object']); $objectURI = $model->uri; if ($show) { - echo Highcharts::widget([ + echo Highstock::widget([ 'id' => 'graphic', 'options' => [ 'chart' => [ @@ -268,6 +353,8 @@ 'subtitle' => [ 'text' => Yii::t('app/messages', 'Click and drag in the plot area to zoom in!') ], + 'legend' => [ + 'enabled' => true], 'xAxis' => [ 'type' => 'datetime', 'title' => 'Date'], @@ -310,7 +397,7 @@ ] ]); } else { - echo Highcharts::widget([ + echo Highstock::widget([ 'id' => 'graphic', 'options' => [ 'time' => ['timezoneOffset' => -2 * 60], @@ -321,6 +408,8 @@ 'subtitle' => [ 'text' => 'Click and drag in the plot area to zoom in' ], + 'legend' => [ + 'enabled' => true], 'xAxis' => [ 'type' => 'datetime', 'title' => 'Date', diff --git a/web/css/site.css b/web/css/site.css index 1ca779d8..f3801184 100755 --- a/web/css/site.css +++ b/web/css/site.css @@ -1,20 +1,26 @@ html,body { height: 100%; } + +#graphic{ + width: 100%; + height: 1000px !important; + text-align: center; +} /*SILEX:info*/ /*use in views/scientific-object/date_visualization.php*/ /*Vertical list of images*/ ul.images { - margin: 0; - padding: 0; - white-space: nowrap; - max-width: 1140px; - overflow-x: auto; + margin: 0; + padding: 0; + white-space: nowrap; + max-width: 1140px; + overflow-x: auto; } ul.images li { - display: inline-block; - width: 200px; - margin: 0 2px; + display: inline-block; + width: 200px; + margin: 0 2px; } /*//\SILEX:info*/ @@ -23,10 +29,10 @@ ul.images li { /* Fix position of the carousel in the modal*/ /*//\SILEX:required*/ .modal.and { - position: fixed; + position: fixed; } - /*SILEX:info*/ - /*use in views/scientific-object/date_visualization.php*/ +/*SILEX:info*/ +/*use in views/scientific-object/date_visualization.php*/ /*Override the default max-width of the tooltip*/ /*//\SILEX:info*/ .tooltip-inner { @@ -37,38 +43,38 @@ ul.images li { /*use in views/scientific-object/date_visualization.php*/ /*Gradient on the photo in the modal to see the text in white */ .pickgradient{ - position:relative; - display:inline-block; + position:relative; + display:inline-block; } .pickgradient:after { - content:''; - position:absolute; - left:0; bottom:0; - width:100%; height:40%; - display:inline-block; - background: -moz-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,0.65) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,0.65)), color-stop(100%,rgba(0,0,0,0))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.65) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.65) 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.65) 100%); /* IE10+ */ - background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,0.65) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#a6000000', endColorstr='#00000000',GradientType=0 ); /* IE6-9 */ + content:''; + position:absolute; + left:0; bottom:0; + width:100%; height:40%; + display:inline-block; + background: -moz-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,0.65) 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,0.65)), color-stop(100%,rgba(0,0,0,0))); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.65) 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.65) 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.65) 100%); /* IE10+ */ + background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,0.65) 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#a6000000', endColorstr='#00000000',GradientType=0 ); /* IE6-9 */ } /*//\SILEX:info*/ .btn:focus,.btn:active { - outline: none !important; - box-shadow: none !important; + outline: none !important; + box-shadow: none !important; } - /*SILEX:info*/ - /*use in views/scientific-object/index.php*/ +/*SILEX:info*/ +/*use in views/scientific-object/index.php*/ /*width of the cart button*/ /*//\SILEX:info*/ #cart-btn { width:88px; /* the size for a 5 digits number*/ - + } @@ -125,7 +131,7 @@ ul.images li { margin: 0 auto; pointer-events: all; } - + /*//\SILEX:info*/ @@ -302,7 +308,7 @@ table .form-group { list-style-type: none; } .li_tiret:before { - content: '- '; + content: '- '; } /*CSS Loader*/ From 0d7bfa540dc0d4833a4d2e207c2f7d4d68d3d053 Mon Sep 17 00:00:00 2001 From: jbonnefont Date: Mon, 30 Sep 2019 14:52:14 +0200 Subject: [PATCH 02/23] optimisation --- .../scientific-object/data_visualization.php | 97 ++++++++----------- web/css/site.css | 2 +- 2 files changed, 39 insertions(+), 60 deletions(-) diff --git a/views/scientific-object/data_visualization.php b/views/scientific-object/data_visualization.php index 2a45dc8c..69d21187 100644 --- a/views/scientific-object/data_visualization.php +++ b/views/scientific-object/data_visualization.php @@ -10,7 +10,6 @@ use Yii; use yii\widgets\ActiveForm; use yii\helpers\Html; -use miloschuman\highcharts\Highcharts; use miloschuman\highcharts\Highstock; use yii\web\JsExpression; use yii\helpers\Url; @@ -314,7 +313,12 @@ $series[] = [ 'type' => 'line', 'name' => $dataFromProvenanceKey, - 'data' => $dataFromProvenanceValue + 'data' => $dataFromProvenanceValue, + 'visible' => true, + 'marker' => [ + 'enabled' => true, + 'radius' => 3 + ] ]; } @@ -340,12 +344,11 @@ $url2 = Url::to(['image/search-from-scientific-object']); $objectURI = $model->uri; - if ($show) { - echo Highstock::widget([ + $options=[ 'id' => 'graphic', 'options' => [ 'chart' => [ - 'zoomType' => 'x' + 'zoomType' => 'xy', ], 'title' => [ 'text' => $variables[$data["variable"]] @@ -357,9 +360,12 @@ 'enabled' => true], 'xAxis' => [ 'type' => 'datetime', - 'title' => 'Date'], + 'title' => 'Date', + ], 'yAxis' => [ - 'title' => null, + 'title' => [ + 'text'=>$variables[$data["variable"]] + ], 'labels' => [ 'format' => '{value:.2f}' ] @@ -370,10 +376,26 @@ ], 'plotOptions' => [ 'series' => [ + 'dataGrouping' => [ + 'enabled' => false + ], 'cursor' => 'pointer', - 'point' => [ - 'events' => [ - 'click' => new JsExpression(" function() {" + 'marker' => [ + 'enabled' => true, + 'states' => [ + 'hover' => [ + 'enabled' => true + ], + 'radius' => 2 + ]], + + ] + ] + ] + ]; + + if ($show) { + $options['options']['plotOptions']['series']['point']['events']['click']=new JsExpression(" function() {" . "var searchFormData = new FormData();" . "console.log( Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0200', 1500768000000));" . "searchFormData.append('concernedItems[]', \"$objectURI\");" @@ -389,55 +411,12 @@ . " contentType: false," . " data: searchFormData," . "}).done(function (data) {onDayImageListHTMLFragmentReception(data);} - ).fail(function (jqXHR, textStatus) {alert('ERROR : ' + jqXHR);});}") - ] - ], - ] - ] - ] - ]); - } else { - echo Highstock::widget([ - 'id' => 'graphic', - 'options' => [ - 'time' => ['timezoneOffset' => -2 * 60], - 'chart' => [ - 'zoomType' => 'x' - ], - 'title' => ['text' => $variables[$data["variable"]]], - 'subtitle' => [ - 'text' => 'Click and drag in the plot area to zoom in' - ], - 'legend' => [ - 'enabled' => true], - 'xAxis' => [ - 'type' => 'datetime', - 'title' => 'Date', - ], - 'yAxis' => [ - 'title' => null, - 'labels' => [ - 'format' => '{value:.2f}' - ] - ], - 'series' => $series, - 'tooltip' => [ - 'xDateFormat' => '%Y-%m-%d %H:%M', - ], - 'plotOptions' => [ - 'series' => [ - 'cursor' => 'pointer', - 'point' => [ - 'events' => [ - 'click' => new JsExpression(" function() {" - . "}") - ] - ] - ] - ] - ] - ]); - } + ).fail(function (jqXHR, textStatus) {alert('ERROR : ' + jqXHR);});}"); + } + echo Highstock::widget($options); + + + } } ?> diff --git a/web/css/site.css b/web/css/site.css index f3801184..18b52c8c 100755 --- a/web/css/site.css +++ b/web/css/site.css @@ -4,7 +4,7 @@ html,body { #graphic{ width: 100%; - height: 1000px !important; + height: 600px !important; text-align: center; } /*SILEX:info*/ From c2936bdc72cde4a29c7b3e0dd8f8f2d01ff93a42 Mon Sep 17 00:00:00 2001 From: jbonnefont Date: Mon, 30 Sep 2019 15:43:03 +0200 Subject: [PATCH 03/23] little changes on images rendering --- views/scientific-object/data_visualization.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/views/scientific-object/data_visualization.php b/views/scientific-object/data_visualization.php index 69d21187..e7cd2e22 100644 --- a/views/scientific-object/data_visualization.php +++ b/views/scientific-object/data_visualization.php @@ -200,17 +200,17 @@ -
+

+ echo "

" . Yii::t('app/messages', 'You have to click a graphic point to see images on that date.') . "

"; } ?>
    - +
@@ -458,12 +458,12 @@ function onDayImageListHTMLFragmentReception(data) { var fragment = $(data); if ($.trim(fragment.find('#carousel-inner-fragment').html()) !== '') { - $('#scientific-object-data-visualization-alert-div').hide(); $('#visualization-images-list').append(fragment.find('#image-visualization-list-fragment').html()); $('#carousel-indicators').append(fragment.find('#carousel-indicators-fragment').html()); $('#carousel-inner').append(fragment.find('#carousel-inner-fragment').html()); $('[data-toggle="tooltip"]').tooltip(); $('#imagesCount').attr('data-id', fragment.find('#counterFragment').attr('data-id')); + $('#scientific-object-data-visualization-alert-div').hide(); } } From 3999d7626c53f11a73eedc7e9a96bd3a5b860fac Mon Sep 17 00:00:00 2001 From: jbonnefont Date: Mon, 30 Sep 2019 17:17:08 +0200 Subject: [PATCH 04/23] events flag highstocks: on datagrouping false effect & time axis bug: --- .../scientific-object/data_visualization.php | 202 +++++++----------- 1 file changed, 76 insertions(+), 126 deletions(-) diff --git a/views/scientific-object/data_visualization.php b/views/scientific-object/data_visualization.php index e7cd2e22..3bfff8c6 100644 --- a/views/scientific-object/data_visualization.php +++ b/views/scientific-object/data_visualization.php @@ -210,7 +210,7 @@ ?>
    - +
@@ -248,66 +248,6 @@ echo "

" . Yii::t('app/messages', 'No result found.') . "

"; } else { - /** - * @var series (before) - * @example - * [ - * [ - * 'name'=>'provenance 1', - * 'data'=>[[],[],[],...] - * ], - * [ 'name'=>'provenance 2', - * 'data'=>[[],[],[],...] - * ], - * - * ] - */ - /** - * @var series (now) - * @example - * [ - * [ - * 'type'=> 'line', - * 'name'=> 'provenance 1', - * 'id'=> 'provenance 1', - * 'data'=>[[1492139471018, 1569],[],[],...], - * 'visible':true, - * 'marker':[ - * 'enabled' :true, - * 'radius' :3 - * ] - * ], - * [ - * 'type'=> 'line', - * 'name'=> 'provenance 2', - * 'id'=> 'provenance 2', - * 'data'=>[[1492139471018, 2769],[],[],...], - * 'visible':true, - * 'marker':[ - * 'enabled' :true, - * 'radius' :3 - * ] - * ],[....], - * [ - * 'type'=> 'flags', - * 'name'=> 'event' - * 'data'=>[ - * [ - * 'x'=>1492139471018, - * 'title'=>'irrigation', - * 'text'=>'http://www.opensilex.org/id/event/f45d3221-104d-4ff2-ad8e-917e99970e05' - * ], - * [ - * ],.. - * ], - * 'lineWidth'=>1, - * 'y'=>-50, - * 'events'=> [ - * 'click'=>new JsExpression("function(event) {}") - * ] - * ] - * ] - */ $series = []; foreach ($data["scientificObjectData"]["dataFromProvenance"]as $dataFromProvenanceKey => $dataFromProvenanceValue) { $series[] = [ @@ -344,79 +284,89 @@ $url2 = Url::to(['image/search-from-scientific-object']); $objectURI = $model->uri; - $options=[ - 'id' => 'graphic', - 'options' => [ - 'chart' => [ - 'zoomType' => 'xy', + $options = [ + 'id' => 'graphic', + 'options' => [ + 'chart' => [ + 'zoomType' => 'xy', + ], + 'title' => [ + 'text' => $variables[$data["variable"]] + ], + 'subtitle' => [ + 'text' => Yii::t('app/messages', 'Click and drag in the plot area to zoom in!') + ], + 'rangeSelector' => [ + 'selected' => 4 + ], + 'navigator' => [ + 'enabled' => true, + 'margin' => 70, + 'y' => -4 + ], + 'legend' => [ + 'enabled' => true + ], + 'xAxis' => [ + 'type' => 'datetime', + + 'title' => [ + 'text' => 'time' ], + 'ordinal' => false, + + ], + 'yAxis' => [ 'title' => [ 'text' => $variables[$data["variable"]] ], - 'subtitle' => [ - 'text' => Yii::t('app/messages', 'Click and drag in the plot area to zoom in!') - ], - 'legend' => [ - 'enabled' => true], - 'xAxis' => [ - 'type' => 'datetime', - 'title' => 'Date', - ], - 'yAxis' => [ - 'title' => [ - 'text'=>$variables[$data["variable"]] + 'labels' => [ + 'format' => '{value:.2f}' + ] + ], + 'series' => $series, + 'tooltip' => [ + 'xDateFormat' => '%Y-%m-%d %H:%M', + ], + 'plotOptions' => [ + 'series' => [ + 'dataGrouping' => [ + 'enabled' => false ], - 'labels' => [ - 'format' => '{value:.2f}' - ] - ], - 'series' => $series, - 'tooltip' => [ - 'xDateFormat' => '%Y-%m-%d %H:%M', - ], - 'plotOptions' => [ - 'series' => [ - 'dataGrouping' => [ - 'enabled' => false - ], - 'cursor' => 'pointer', - 'marker' => [ - 'enabled' => true, - 'states' => [ - 'hover' => [ - 'enabled' => true - ], - 'radius' => 2 - ]], - - ] + 'cursor' => 'pointer', + 'marker' => [ + 'enabled' => true, + 'states' => [ + 'hover' => [ + 'enabled' => true + ], + 'radius' => 2 + ]], ] ] - ]; - - if ($show) { - $options['options']['plotOptions']['series']['point']['events']['click']=new JsExpression(" function() {" - . "var searchFormData = new FormData();" - . "console.log( Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0200', 1500768000000));" - . "searchFormData.append('concernedItems[]', \"$objectURI\");" - . "searchFormData.append('DataFileSearch[rdfType]',\"$imageTypeSelected\");" - . "searchFormData.append('jsonValueFilter', \"$filterToSend\");" - . "searchFormData.append('startDate',Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0000', this.x));" - . "searchFormData.append('endDate',Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0000', this.x));" - . "searchFormData.append('imagesCount',$('#imagesCount').attr('data-id'));" - . "$.ajax({url: \"$url2\"," - . " type: 'POST'," - . " processData: false," - . " datatype: 'json'," - . " contentType: false," - . " data: searchFormData," - . "}).done(function (data) {onDayImageListHTMLFragmentReception(data);} + ] + ]; + + if ($show) { + $options['options']['plotOptions']['series']['point']['events']['click'] = new JsExpression(" function() {" + . "var searchFormData = new FormData();" + . "console.log( Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0200', 1500768000000));" + . "searchFormData.append('concernedItems[]', \"$objectURI\");" + . "searchFormData.append('DataFileSearch[rdfType]',\"$imageTypeSelected\");" + . "searchFormData.append('jsonValueFilter', \"$filterToSend\");" + . "searchFormData.append('startDate',Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0000', this.x));" + . "searchFormData.append('endDate',Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0000', this.x));" + . "searchFormData.append('imagesCount',$('#imagesCount').attr('data-id'));" + . "$.ajax({url: \"$url2\"," + . " type: 'POST'," + . " processData: false," + . " datatype: 'json'," + . " contentType: false," + . " data: searchFormData," + . "}).done(function (data) {onDayImageListHTMLFragmentReception(data);} ).fail(function (jqXHR, textStatus) {alert('ERROR : ' + jqXHR);});}"); - } - echo Highstock::widget($options); - - - + } + echo Highstock::widget($options); } } ?> From dd5db3b6643d17beda7eb5e592fe222fb6e78d5b Mon Sep 17 00:00:00 2001 From: jbonnefont Date: Tue, 1 Oct 2019 16:01:25 +0200 Subject: [PATCH 05/23] events visualization: catch exception on EventSearch to search events - some little changes on highstock - min Date max Date to search Events --- controllers/EventController.php | 1 + controllers/ScientificObjectController.php | 25 +++++-- models/yiiModels/EventSearch.php | 14 ++-- .../scientific-object/data_visualization.php | 74 +++++++++---------- 4 files changed, 63 insertions(+), 51 deletions(-) diff --git a/controllers/EventController.php b/controllers/EventController.php index 3b6ed9da..ad537da3 100644 --- a/controllers/EventController.php +++ b/controllers/EventController.php @@ -26,6 +26,7 @@ * Controller for the events. * @see yii\web\Controller * @see app\models\yiiModels\YiiEventModel + * @update [Bonnefont Julien] 1 octobre, 2019: correction bug token on actionView * @author Andréas Garcia */ class EventController extends GenericController { diff --git a/controllers/ScientificObjectController.php b/controllers/ScientificObjectController.php index e50c2764..e9475cec 100755 --- a/controllers/ScientificObjectController.php +++ b/controllers/ScientificObjectController.php @@ -21,6 +21,8 @@ use app\models\yiiModels\ScientificObjectSearch; use app\models\yiiModels\YiiExperimentModel; use app\models\yiiModels\EventSearch; +use app\models\wsModels\WSConstants; +use app\components\helpers\SiteMessages; require_once '../config/config.php'; @@ -1004,17 +1006,28 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { $searchModel = new EventSearch(); $searchModel->pageSize = 800; $searchModel->searchConcernedItemUri = $uri; + $searchModel->searchDateRangeStart = $_POST['dateStart']; + $searchModel->searchDateRangeEnd = $_POST['dateEnd']; $searchResult = $searchModel->search($token, null); - $events = array(); - - foreach ($searchResult->getModels() as $model) { - $events[] = [ - 'date' =>(strtotime($model->date)) * 1000, - 'title' => explode('#',$model->rdfType)[1], + if (is_string($searchResult)) { + if ($searchResult === WSConstants::TOKEN_INVALID) { + return $this->redirect(Yii::$app->urlManager->createUrl(SiteMessages::SITE_LOGIN_PAGE_ROUTE)); + } else { + return $this->render(SiteMessages::SITE_ERROR_PAGE_ROUTE, [ + SiteMessages::SITE_PAGE_NAME => SiteMessages::INTERNAL_ERROR, + SiteMessages::SITE_PAGE_MESSAGE => $searchResult]); + } + } else { + foreach ($searchResult->getModels() as $model) { + $events[] = [ + 'date' => (strtotime($model->date)) * 1000, + 'title' => explode('#', $model->rdfType)[1], 'text' => $model->uri ]; + } } + //on FORM submitted: //check if image visualization is activated $show = isset($_POST['show']) ? $_POST['show'] : null; diff --git a/models/yiiModels/EventSearch.php b/models/yiiModels/EventSearch.php index e615697b..1c02b2e7 100644 --- a/models/yiiModels/EventSearch.php +++ b/models/yiiModels/EventSearch.php @@ -17,7 +17,9 @@ /** * Search action for the events + * @update [Bonnefont Julien] 1 octobre, 2019: return exception on search action * @author Andréas Garcia + * */ class EventSearch extends YiiEventModel { @@ -124,15 +126,17 @@ public function search($sessionToken, $searchParams) { * @return request result */ private function getEventProvider($sessionToken, $searchParams) { - $results = $this->find($sessionToken, array_merge($this->attributesToArray(), $searchParams)); + $results = $this->find($sessionToken, $this->attributesToArray()); + // var_dump($results);exit; if (is_string($results)) { return $results; - } else if (isset($results->{WSConstants::DATA}->{WSConstants::STATUS}[0]->{WSConstants::EXCEPTION}->{WSConstants::DETAILS}) - && $results->{WSConstants::METADATA}->{WSConstants::STATUS}[0]->{WSConstants::EXCEPTION}->{WSConstants::DETAILS} === WSConstants::TOKEN_INVALID) { - return WSConstants::TOKEN_INVALID; + } else if (isset($results->{'metadata'}->{'status'}[0]->{'exception'}->{'details'}) + && $results->{'metadata'}->{'status'}[0]->{'exception'}->{'details'} === \app\models\wsModels\WSConstants::TOKEN_INVALID) { + return \app\models\wsModels\WSConstants::TOKEN_INVALID; + } else if (isset($results->{'metadata'}->{'status'}[0]->{'exception'}->{'details'})) { + return $results->{'metadata'}->{'status'}[0]->{'exception'}->{'details'}; } else { - $events = $this->jsonListOfArraysToArray($results); return new ArrayDataProvider([ 'models' => $events, diff --git a/views/scientific-object/data_visualization.php b/views/scientific-object/data_visualization.php index 3bfff8c6..e81fec7f 100644 --- a/views/scientific-object/data_visualization.php +++ b/views/scientific-object/data_visualization.php @@ -200,46 +200,46 @@
-
- -
-

" . Yii::t('app/messages', 'You have to click a graphic point to see images on that date.') . "

"; - } - ?> - -
    - -
- -
-
-
-
-
- - - +
[ 'text' => Yii::t('app/messages', 'Click and drag in the plot area to zoom in!') ], - 'rangeSelector' => [ - 'selected' => 4 - ], 'navigator' => [ 'enabled' => true, 'margin' => 70, @@ -309,12 +305,10 @@ ], 'xAxis' => [ 'type' => 'datetime', - 'title' => [ 'text' => 'time' ], 'ordinal' => false, - ], 'yAxis' => [ 'title' => [ From 8b39a12e1938fbb73219fba4d9fc8c4e1ec999c1 Mon Sep 17 00:00:00 2001 From: jbonnefont Date: Wed, 2 Oct 2019 10:07:17 +0200 Subject: [PATCH 06/23] start the branch --- controllers/ScientificObjectController.php | 2 -- .../scientific-object/data_visualization.php | 23 +++++++++---------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/controllers/ScientificObjectController.php b/controllers/ScientificObjectController.php index e9475cec..07d9dcbe 100755 --- a/controllers/ScientificObjectController.php +++ b/controllers/ScientificObjectController.php @@ -1026,8 +1026,6 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { ]; } } - - //on FORM submitted: //check if image visualization is activated $show = isset($_POST['show']) ? $_POST['show'] : null; diff --git a/views/scientific-object/data_visualization.php b/views/scientific-object/data_visualization.php index e81fec7f..5b0436aa 100644 --- a/views/scientific-object/data_visualization.php +++ b/views/scientific-object/data_visualization.php @@ -36,16 +36,15 @@ } else { ?>
-
-
+
- - + 'variable', @@ -92,6 +91,7 @@ ]); ?>
+
@@ -134,9 +134,7 @@
- 'showWidget', 'label' => Yii::t('app', 'Show Images'), 'onchange' => 'onShow(this);']) ?> -
@@ -145,11 +143,12 @@ -
+
- + 'imageType', @@ -168,10 +167,10 @@ ]); ?>
+
- - - + 'filter', @@ -237,7 +236,7 @@
- +
From f1a6077cb5d9b602406431842816d2a29c0e8566 Mon Sep 17 00:00:00 2001 From: jbonnefont Date: Thu, 3 Oct 2019 16:56:56 +0200 Subject: [PATCH 07/23] clic event on the serie- start the create popup - some exception/token stuff --- .../widgets/event/EventButtonWidget.php | 9 +- controllers/ScientificObjectController.php | 15 +- models/yiiModels/YiiExperimentModel.php | 150 +++++++++++------- .../scientific-object/data_visualization.php | 82 +++++++++- views/scientific-object/index.php | 2 +- 5 files changed, 189 insertions(+), 69 deletions(-) diff --git a/components/widgets/event/EventButtonWidget.php b/components/widgets/event/EventButtonWidget.php index 80ea914e..234a00cf 100644 --- a/components/widgets/event/EventButtonWidget.php +++ b/components/widgets/event/EventButtonWidget.php @@ -45,13 +45,16 @@ class EventButtonWidget extends Widget { const CONCERNED_ITEMS_URIS = "concernedItemsUris"; /** - * Defines the type of object which will be annotated. + * Defines to wich type of model the event will be create ( scientific object, vector, sensor..). * @var array */ public $type; const TYPE = "type"; + public $size=""; + + const SIZE="size"; /** * Renders the event button. * @return string the string rendered @@ -67,10 +70,10 @@ public function run() { EventController::PARAM_RETURN_URL => Url::current() ]; if (!$this->asLink) { - $linkLabel = Icon::show('flag', [], Icon::FA) . " " . Yii::t('app', self::ADD_EVENT_LABEL); + $linkLabel = Icon::show('flag', ['class'=>$this->size], Icon::FA) . " " . Yii::t('app', self::ADD_EVENT_LABEL); } else { - $linkLabel = ''; + $linkLabel =Icon::show('flag', ['class'=>$this->size], Icon::FA); } if(!isset($this->type)){ $linkAttributes = ['class' => 'btn btn-default']; diff --git a/controllers/ScientificObjectController.php b/controllers/ScientificObjectController.php index 07d9dcbe..d91b6b41 100755 --- a/controllers/ScientificObjectController.php +++ b/controllers/ScientificObjectController.php @@ -934,7 +934,18 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { $variables = $variableModel->getInstancesDefinitionsUrisAndLabel($token); } else { //There is an experiment. Get the variables linked to the experiment. $experimentModel = new YiiExperimentModel(); - $variables = $experimentModel->getMeasuredVariables($token, $scientificObject->experiment); + $variablesSearch = $experimentModel->getMeasuredVariables($token, $scientificObject->experiment); + + if (is_string($variablesSearch)) { + if ($variablesSearch === WSConstants::TOKEN_INVALID) { + return $this->redirect(Yii::$app->urlManager->createUrl(SiteMessages::SITE_LOGIN_PAGE_ROUTE)); + } else { + return $this->render(SiteMessages::SITE_ERROR_PAGE_ROUTE, [ + SiteMessages::SITE_PAGE_NAME => SiteMessages::INTERNAL_ERROR, + SiteMessages::SITE_PAGE_MESSAGE => $variablesSearch]); + } + } + $variables=$experimentModel->variables; } // Load existing provenances @@ -1018,6 +1029,7 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { SiteMessages::SITE_PAGE_MESSAGE => $searchResult]); } } else { + foreach ($searchResult->getModels() as $model) { $events[] = [ 'date' => (strtotime($model->date)) * 1000, @@ -1025,6 +1037,7 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { 'text' => $model->uri ]; } + } //on FORM submitted: //check if image visualization is activated diff --git a/models/yiiModels/YiiExperimentModel.php b/models/yiiModels/YiiExperimentModel.php index 0fd11a3b..02b40e0c 100755 --- a/models/yiiModels/YiiExperimentModel.php +++ b/models/yiiModels/YiiExperimentModel.php @@ -16,7 +16,6 @@ use app\models\wsModels\WSActiveRecord; use app\models\wsModels\WSExperimentModel; - use Yii; /** @@ -25,6 +24,7 @@ * (WSActiveRecord, for the web services access) * @see app\models\wsModels\WSExperimentModel * @see app\models\wsModels\WSActiveRecord + * @update [Bonnefont Julien] 3 octobre, 2019: return exception or token on findByURI * @author Morgane Vidal */ class YiiExperimentModel extends WSActiveRecord { @@ -35,77 +35,99 @@ class YiiExperimentModel extends WSActiveRecord { * @var string */ public $uri; + const URI = "uri"; + /** * the start date of the experiment * (e.g 2017-01-01) * @var string */ public $startDate; + const START_DATE = "startDate"; + /** * the end date of the experiment * (e.g 2017-07-01) * @var string */ public $endDate; + const END_DATE = "endDate"; + /** * the field * (e.g Epoisses - plot F) * @var string */ public $field; + const FIELD = "field"; + /** * the campaign (corresponds to the flowering date) * (e.g 2017) * @var string */ public $campaign; + const CAMPAIGN = "campaign"; + /** * the place of the experiment * (e.g. Bretenière) * @var string */ public $place; + const PLACE = "place"; + /** * the experiment's alias used in the platform * @var string */ public $alias; + const ALIAS = "alias"; + /** * the experiment's comments * (e.g. C17RAP) * @var string */ public $comment; + const COMMENT = "comment"; + /** * the experiment's description keywords * (e.g Colza, azote, phénotypage, capteurs, images, variables agronomiques) * @var string */ public $keywords; + const KEYWORDS = "keywords"; + /** * the experiment's objectives * (e.g Rapsodyn- phénotypage) * @var string */ public $objective; + const OBJECTIVE = "objective"; + /** * the groups (uris) in which the experiment is. * (e.g http://www.phenome-fppn.fr/diaphen/INRA-LEPSE-DROPS) * @var array */ public $groups; + const GROUPS = "groups"; const GROUPS_URIS = "groupsUris"; + /** * the experiment's crop species. It is a string but will be replace by an * array of species uri when the crop species service will be done. @@ -113,54 +135,64 @@ class YiiExperimentModel extends WSActiveRecord { * @var string */ public $cropSpecies; + const CROP_SPECIES = "cropSpecies"; + /** * the projects (uri => acronyme) in which the experiment is. * (e.g http://www.phenome-fppn.fr/phenovia/RAPSODYN => RAPSODYN) * @var array */ public $projects; + const PROJECTS = "projects"; const PROJECTS_URIS = "projectsUris"; - + /** * the project uri where the experiment is searched. * (e.g http://www.phenome-fppn.fr/phenovia/RAPSODYN) * @var string */ public $projectUri; + const PROJECT_URI = "projectUri"; - + /** * the experiment's scientific supervisors contacts (email). * (e.g john.doe[at]inra.fr) * @var array */ public $scientificSupervisorContacts; + const CONTACT_SCIENTIFIC_SUPERVISOR = "http://www.opensilex.org/vocabulary/oeso/#ScientificSupervisor"; const CONTACT_TECHNICAL_SUPERVISOR = "http://www.opensilex.org/vocabulary/oeso/#TechnicalSupervisor"; + /** * the experiment's technical supervisor contacts (email). * (e.g. john.doe[at]inra.fr) * @var array */ public $technicalSupervisorContacts; - + const CONTACTS = "contacts"; const CONTACT_TYPE = "type"; + /** * The list of the variables measured by the experiment * @var array */ public $variables; + const VARIABLES = "variables"; + /** * The list of sensors which participates in the experiment * @var array */ public $sensors; + const SENSORS = "sensors"; - + /** * Initialize wsModel. In this class, wsModel is a WSExperimentModel * @param string $pageSize number of elements per page @@ -172,21 +204,21 @@ public function __construct($pageSize = null, $page = null) { ($pageSize !== null || $pageSize !== "") ? $this->pageSize = $pageSize : $this->pageSize = null; ($page !== null || $page !== "") ? $this->page = $page : $this->page = null; } - + /** * * @return array the rules of the attributes */ public function rules() { return [ - [['uri', 'startDate', 'endDate', 'projects', 'campaign'], 'required'], - [['startDate', 'endDate', 'projects', 'groups', 'scientificSupervisorContacts', 'technicalSupervisorContacts'], 'safe'], - [['comment', 'cropSpecies'], 'string'], - [['uri', 'alias', 'keywords', 'objective'], 'string', 'max' => 255], - [['field', 'campaign', 'place'], 'string', 'max' => 50], + [['uri', 'startDate', 'endDate', 'projects', 'campaign'], 'required'], + [['startDate', 'endDate', 'projects', 'groups', 'scientificSupervisorContacts', 'technicalSupervisorContacts'], 'safe'], + [['comment', 'cropSpecies'], 'string'], + [['uri', 'alias', 'keywords', 'objective'], 'string', 'max' => 255], + [['field', 'campaign', 'place'], 'string', 'max' => 50], ]; } - + /** * * @return array the labels of the attributes @@ -212,13 +244,13 @@ public function attributeLabels() { 'sensors' => Yii::t('app', 'Sensors which participates in') ]; } - + /** * allows to fill the attributes with the informations in the array given * @param array $array array key => value which contains the metadata of * an experiment */ - public function arrayToAttributes($array) { + public function arrayToAttributes($array) { $this->uri = $array[YiiExperimentModel::URI]; $this->startDate = $array[YiiExperimentModel::START_DATE]; $this->endDate = $array[YiiExperimentModel::END_DATE]; @@ -230,15 +262,15 @@ public function arrayToAttributes($array) { $this->keywords = $array[YiiExperimentModel::KEYWORDS]; $this->objective = $array[YiiExperimentModel::OBJECTIVE]; $this->cropSpecies = $array[YiiExperimentModel::CROP_SPECIES]; - + if (isset($array[YiiExperimentModel::PROJECTS])) { foreach ($array[YiiExperimentModel::PROJECTS] as $project) { $experimentProject[YiiProjectModel::URI] = $project->{YiiProjectModel::URI}; $experimentProject[YiiProjectModel::SHORTNAME] = $project->{YiiProjectModel::SHORTNAME}; - $this->projects[] = $experimentProject; + $this->projects[] = $experimentProject; } } - + if (isset($array[YiiExperimentModel::GROUPS])) { foreach ($array[YiiExperimentModel::GROUPS] as $group) { $experimentGroup[YiiGroupModel::URI] = $group->{YiiGroupModel::URI}; @@ -246,13 +278,13 @@ public function arrayToAttributes($array) { $this->groups[] = $experimentGroup; } } - + if (isset($array[YiiExperimentModel::CONTACTS])) { foreach ($array[YiiExperimentModel::CONTACTS] as $contact) { $experimentContact[YiiUserModel::FIRST_NAME] = $contact->{YiiUserModel::FIRST_NAME}; $experimentContact[YiiUserModel::FAMILY_NAME] = $contact->{YiiUserModel::FAMILY_NAME}; $experimentContact[YiiUserModel::EMAIL] = $contact->{YiiUserModel::EMAIL}; - + if ($contact->{YiiExperimentModel::CONTACT_TYPE} === YiiExperimentModel::CONTACT_SCIENTIFIC_SUPERVISOR) { $this->scientificSupervisorContacts[] = $experimentContact; } else { @@ -260,16 +292,16 @@ public function arrayToAttributes($array) { } } } - + foreach ($array[YiiExperimentModel::VARIABLES] as $variableUri => $variableLabel) { - $this->variables[$variableUri] = $variableLabel; + $this->variables[$variableUri] = $variableLabel; } - + foreach ($array[YiiExperimentModel::SENSORS] as $sensorUri => $sensorLabel) { - $this->sensors[$sensorUri] = $sensorLabel; + $this->sensors[$sensorUri] = $sensorLabel; } } - + /** * get experiment's informations by uri * @param string $sessionToken user session token @@ -278,25 +310,30 @@ public function arrayToAttributes($array) { public function findByURI($sessionToken, $uri) { $params = []; if ($this->pageSize !== null) { - $params[\app\models\wsModels\WSConstants::PAGE_SIZE] = $this->pageSize; + $params[\app\models\wsModels\WSConstants::PAGE_SIZE] = $this->pageSize; } if ($this->page !== null) { $params[\app\models\wsModels\WSConstants::PAGE] = $this->page; } $requestRes = $this->wsModel->getExperimentByURI($sessionToken, $uri, $params); + if (!is_string($requestRes)) { - if (isset($requestRes[\app\models\wsModels\WSConstants::TOKEN_INVALID])) { - return $requestRes; + if (isset($requestRes->{'metadata'}->{'status'}[0]->{'exception'}->{'details'}) && $requestRes->{'metadata'}->{'status'}[0]->{'exception'}->{'details'} === \app\models\wsModels\WSConstants::TOKEN_INVALID) { + + return \app\models\wsModels\WSConstants::TOKEN_INVALID; + } else if (isset($requestRes->{'metadata'}->{'status'}[0]->{'exception'}->{'details'})) { + return $requestRes->{'metadata'}->{'status'}[0]->{'exception'}->{'details'}; } else { $this->arrayToAttributes($requestRes); return true; } } else { + return $requestRes; } } - + /** * Get the list of uri of the experiments. * @param string $sessionToken @@ -309,25 +346,25 @@ public function findByURI($sessionToken, $uri) { public function getExperimentsURIList($sessionToken) { $experiments = $this->find($sessionToken, $this->attributesToArray()); $experimentsToReturn = []; - + if ($experiments !== null) { //1. get the URIs - foreach($experiments as $experiment) { + foreach ($experiments as $experiment) { $experimentsToReturn[] = $experiment->uri; } - + //2. if there are other pages, get the other experiments if ($this->totalPages > $this->page) { $this->page++; //next page $nextExperiments = $this->getExperimentsURIList($sessionToken); - + $experimentsToReturn = array_merge($experimentsToReturn, $nextExperiments); } - + return $experimentsToReturn; } } - + /** * Get the list of uri of the experiments. * @param string $sessionToken @@ -340,26 +377,26 @@ public function getExperimentsURIList($sessionToken) { public function getExperimentsURIAndLabelList($sessionToken) { $experiments = $this->find($sessionToken, $this->attributesToArray()); $experimentsToReturn = []; - + if ($experiments !== null) { //1. get the URIs - foreach($experiments as $experiment) { + foreach ($experiments as $experiment) { $experimentsToReturn[$experiment->uri] = $experiment->alias; } - + //2. if there are other pages, get the other experiments if ($this->totalPages > $this->page) { $this->page++; //next page $nextExperiments = $this->getExperimentsURIAndLabelList($sessionToken); - + $experimentsToReturn = array_merge($experimentsToReturn, $nextExperiments); } - + return $experimentsToReturn; } } - - /** + + /** * Create an array representing the experiment * Used for the web service for example * @return array with the attributes. @@ -372,25 +409,25 @@ public function attributesToArray() { $elementForWebService[YiiExperimentModel::FIELD] = $this->field; $elementForWebService[YiiExperimentModel::CAMPAIGN] = $this->campaign; $elementForWebService[YiiExperimentModel::PLACE] = $this->place; - $elementForWebService[YiiExperimentModel::ALIAS]= $this->alias; + $elementForWebService[YiiExperimentModel::ALIAS] = $this->alias; $elementForWebService[YiiExperimentModel::COMMENT] = $this->comment; $elementForWebService[YiiExperimentModel::KEYWORDS] = $this->keywords; - $elementForWebService[YiiExperimentModel::OBJECTIVE] = $this->objective; + $elementForWebService[YiiExperimentModel::OBJECTIVE] = $this->objective; $elementForWebService[YiiExperimentModel::GROUPS] = $this->groups; - $elementForWebService[YiiExperimentModel::PROJECTS_URIS] = $this->projects; + $elementForWebService[YiiExperimentModel::PROJECTS_URIS] = $this->projects; $elementForWebService[YiiExperimentModel::CROP_SPECIES] = $this->cropSpecies; // Project Uri is only used in case of search and not in case of posting data if ($this->projectUri != null) { - $elementForWebService[YiiExperimentModel::PROJECT_URI] = $this->projectUri; + $elementForWebService[YiiExperimentModel::PROJECT_URI] = $this->projectUri; } - + if ($this->groups != null) { foreach ($this->groups as $groupUri) { $elementForWebService[YiiExperimentModel::GROUPS_URIS][] = $groupUri; } } - + if ($this->scientificSupervisorContacts != null) { foreach ($this->scientificSupervisorContacts as $scientificSupervisor) { $contact[YiiExperimentModel::CONTACT_TYPE] = YiiExperimentModel::CONTACT_SCIENTIFIC_SUPERVISOR; @@ -398,7 +435,7 @@ public function attributesToArray() { $elementForWebService[YiiExperimentModel::CONTACTS][] = $contact; } } - + if ($this->technicalSupervisorContacts != null) { foreach ($this->technicalSupervisorContacts as $technicalSupervisor) { $contact[YiiExperimentModel::CONTACT_TYPE] = YiiExperimentModel::CONTACT_TECHNICAL_SUPERVISOR; @@ -406,10 +443,10 @@ public function attributesToArray() { $elementForWebService[YiiExperimentModel::CONTACTS][] = $contact; } } - + return $elementForWebService; } - + /** * Update variables measured by an experiment * @param string $sessionToken @@ -419,7 +456,7 @@ public function attributesToArray() { */ public function updateVariables($sessionToken, $experimentUri, $variablesUri) { $requestRes = $this->wsModel->putExperimentVariables($sessionToken, $experimentUri, $variablesUri); - + if (is_string($requestRes) && $requestRes === "token") { return $requestRes; } else if (isset($requestRes->{\app\models\wsModels\WSConstants::METADATA}->{\app\models\wsModels\WSConstants::STATUS})) { @@ -428,7 +465,7 @@ public function updateVariables($sessionToken, $experimentUri, $variablesUri) { return $requestRes; } } - + /** * Update sensors which participates in an experiment * @param string $sessionToken @@ -438,7 +475,7 @@ public function updateVariables($sessionToken, $experimentUri, $variablesUri) { */ public function updateSensors($sessionToken, $experimentUri, $sensorsUris) { $requestRes = $this->wsModel->putExperimentSensors($sessionToken, $experimentUri, $sensorsUris); - + if (is_string($requestRes) && $requestRes === "token") { return $requestRes; } else if (isset($requestRes->{\app\models\wsModels\WSConstants::METADATA}->{\app\models\wsModels\WSConstants::STATUS})) { @@ -447,7 +484,7 @@ public function updateSensors($sessionToken, $experimentUri, $sensorsUris) { return $requestRes; } } - + /** * Get the variables measured by the given experiment * @param string $sessionToken @@ -462,10 +499,11 @@ public function getMeasuredVariables($sessionToken, $experimentUri) { $variables = []; if (!empty($experimentUri)) { if ($this->findByURI($sessionToken, $experimentUri)) { - return $this->variables; + return $this->findByURI($sessionToken, $experimentUri); } } - + return $variables; } + } diff --git a/views/scientific-object/data_visualization.php b/views/scientific-object/data_visualization.php index 5b0436aa..90f422bb 100644 --- a/views/scientific-object/data_visualization.php +++ b/views/scientific-object/data_visualization.php @@ -13,6 +13,8 @@ use miloschuman\highcharts\Highstock; use yii\web\JsExpression; use yii\helpers\Url; +use app\components\widgets\AnnotationButtonWidget; +use app\components\widgets\event\EventButtonWidget; $this->title = $model->label; $this->params['breadcrumbs'][] = ['label' => Yii::t('app', '{n, plural, =1{Scientific Object} other{Scientific Objects}}', ['n' => 2]), 'url' => ['index']]; @@ -41,7 +43,7 @@
- +
@@ -91,7 +93,7 @@ ]); ?>
- +
@@ -144,7 +146,7 @@
- +
- +
@@ -271,9 +273,10 @@ $eventsTab[] = [ 'type' => 'flags', + 'allowOverlapX'=> true, 'name' => 'Events', 'lineWidth' => 1, - 'y' => -50, + 'y' => -40, 'data' => $Eventsdata ]; @@ -286,7 +289,7 @@ 'id' => 'graphic', 'options' => [ 'chart' => [ - 'zoomType' => 'xy', + 'zoomType' => 'x', ], 'title' => [ 'text' => $variables[$data["variable"]] @@ -300,7 +303,7 @@ 'y' => -4 ], 'legend' => [ - 'enabled' => true + 'enabled' => true, ], 'xAxis' => [ 'type' => 'datetime', @@ -308,6 +311,9 @@ 'text' => 'time' ], 'ordinal' => false, + 'crosshair' => [ + 'enabled' => false, + ] ], 'yAxis' => [ 'title' => [ @@ -334,7 +340,26 @@ 'enabled' => true ], 'radius' => 2 - ]], + ] + ], + 'events' => [ + 'click' => new JsExpression(' + function (event) { + + console.log("dates"); + var dates=this.data; + var tab=[]; + console.log(this); + dates.forEach(function(date) {tab.push(Highcharts.dateFormat("%Y-%m-%dT%H:%M:%S+0200", date.x));}); + console.log(tab.sort()); + var real=this.xAxis.toValue(event.chartX, false); + console.log(Highcharts.dateFormat("%Y-%m-%dT%H:%M:%S+0200", real)); + if(this.name!=="Events"){ + $("#events-lightbox").modal("show") ;} + console.log(event.point.x); + var time=Highcharts.dateFormat("%Y-%m-%dT%H:%M:%S+0200", event.point.x); + console.log(time)}') + ] ] ] ] @@ -363,6 +388,45 @@ } } ?> + + + +
@@ -392,6 +456,8 @@ }); + + /** * This function is call on the response of the ajax call when a user click on a point on the graphic to get images * to be used with a carousel bootstrap widget and a vertical list up to the graphic. diff --git a/views/scientific-object/index.php b/views/scientific-object/index.php index f8e41942..b327ef84 100755 --- a/views/scientific-object/index.php +++ b/views/scientific-object/index.php @@ -46,7 +46,7 @@ EventButtonWidget::widget([ EventButtonWidget::TYPE => "scientific-objects", EventButtonWidget::CONCERNED_ITEMS_URIS => null, - EventButtonWidget::AS_LINK => false + EventButtonWidget::AS_LINK => false, ]); ?> From f7c0964cc0d68e28f873fb6e4149f926b7227798 Mon Sep 17 00:00:00 2001 From: jbonnefont Date: Fri, 4 Oct 2019 16:32:13 +0200 Subject: [PATCH 08/23] stuff --- controllers/ScientificObjectController.php | 6 ++-- .../scientific-object/data_visualization.php | 29 +++++++++---------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/controllers/ScientificObjectController.php b/controllers/ScientificObjectController.php index d91b6b41..397fea67 100755 --- a/controllers/ScientificObjectController.php +++ b/controllers/ScientificObjectController.php @@ -935,7 +935,7 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { } else { //There is an experiment. Get the variables linked to the experiment. $experimentModel = new YiiExperimentModel(); $variablesSearch = $experimentModel->getMeasuredVariables($token, $scientificObject->experiment); - + if (is_string($variablesSearch)) { if ($variablesSearch === WSConstants::TOKEN_INVALID) { return $this->redirect(Yii::$app->urlManager->createUrl(SiteMessages::SITE_LOGIN_PAGE_ROUTE)); @@ -1005,7 +1005,7 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { $dataByProvenanceToSave[] = $dataEl['value']; $dataByProvenance[$dataEl['provenanceUri']][] = $dataByProvenanceToSave; } - + if (!empty($data)) { $toReturn["variable"] = $searchModel->variable; $scientificObjectData["dataFromProvenance"] = $dataByProvenance; @@ -1029,7 +1029,7 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { SiteMessages::SITE_PAGE_MESSAGE => $searchResult]); } } else { - + foreach ($searchResult->getModels() as $model) { $events[] = [ 'date' => (strtotime($model->date)) * 1000, diff --git a/views/scientific-object/data_visualization.php b/views/scientific-object/data_visualization.php index 90f422bb..ccec987e 100644 --- a/views/scientific-object/data_visualization.php +++ b/views/scientific-object/data_visualization.php @@ -256,10 +256,6 @@ 'name' => $dataFromProvenanceKey, 'data' => $dataFromProvenanceValue, 'visible' => true, - 'marker' => [ - 'enabled' => true, - 'radius' => 3 - ] ]; } @@ -273,7 +269,7 @@ $eventsTab[] = [ 'type' => 'flags', - 'allowOverlapX'=> true, + 'allowOverlapX' => true, 'name' => 'Events', 'lineWidth' => 1, 'y' => -40, @@ -311,9 +307,7 @@ 'text' => 'time' ], 'ordinal' => false, - 'crosshair' => [ - 'enabled' => false, - ] + 'crosshair' => false, ], 'yAxis' => [ 'title' => [ @@ -326,6 +320,7 @@ 'series' => $series, 'tooltip' => [ 'xDateFormat' => '%Y-%m-%d %H:%M', + ], 'plotOptions' => [ 'series' => [ @@ -334,7 +329,7 @@ ], 'cursor' => 'pointer', 'marker' => [ - 'enabled' => true, + 'enabled' => false, 'states' => [ 'hover' => [ 'enabled' => true @@ -346,17 +341,19 @@ 'click' => new JsExpression(' function (event) { - console.log("dates"); - var dates=this.data; - var tab=[]; - console.log(this); - dates.forEach(function(date) {tab.push(Highcharts.dateFormat("%Y-%m-%dT%H:%M:%S+0200", date.x));}); - console.log(tab.sort()); + //console.log(event); + // var dates=this.data; + // var tab=[]; + console.log("COMPARE"); + // dates.forEach(function(date) {tab.push(Highcharts.dateFormat("%Y-%m-%dT%H:%M:%S+0200", date.x));}); + //console.log(tab.sort()); var real=this.xAxis.toValue(event.chartX, false); + console.log(real); + console.log(event.point.x); console.log(Highcharts.dateFormat("%Y-%m-%dT%H:%M:%S+0200", real)); if(this.name!=="Events"){ $("#events-lightbox").modal("show") ;} - console.log(event.point.x); + var time=Highcharts.dateFormat("%Y-%m-%dT%H:%M:%S+0200", event.point.x); console.log(time)}') ] From e10821ec5bba2f13bfb3ab31852993bf731c68b3 Mon Sep 17 00:00:00 2001 From: jbonnefont Date: Wed, 9 Oct 2019 15:25:50 +0200 Subject: [PATCH 09/23] Images serie attached to data serie- images visualization on click --- controllers/ImageController.php | 2 +- controllers/ScientificObjectController.php | 189 ++++++++++++++---- models/yiiModels/DataFileSearch.php | 27 +-- models/yiiModels/DataSearchLayers.php | 4 +- models/yiiModels/YiiDataFileModel.php | 3 +- models/yiiModels/YiiDataModel.php | 2 + .../scientific-object/data_visualization.php | 132 ++++++++---- 7 files changed, 273 insertions(+), 86 deletions(-) diff --git a/controllers/ImageController.php b/controllers/ImageController.php index 1a7690e4..418503dc 100755 --- a/controllers/ImageController.php +++ b/controllers/ImageController.php @@ -69,7 +69,7 @@ public function actionSearchFromLayer() { * @throws Exception */ public function actionSearchFromScientificObject() { - $searchModel = new DataFileSearch($pageSize = 100); + $searchModel = new DataFileSearch($pageSize = 8000); if ($searchModel->load(Yii::$app->request->post())) { $searchModel->startDate = Yii::$app->request->post()["startDate"]; $searchModel->endDate = Yii::$app->request->post()["endDate"]; diff --git a/controllers/ScientificObjectController.php b/controllers/ScientificObjectController.php index 397fea67..5a7f5950 100755 --- a/controllers/ScientificObjectController.php +++ b/controllers/ScientificObjectController.php @@ -17,9 +17,11 @@ use Yii; use yii\web\Controller; use yii\filters\VerbFilter; +use yii\helpers\Url; use app\models\yiiModels\YiiScientificObjectModel; use app\models\yiiModels\ScientificObjectSearch; use app\models\yiiModels\YiiExperimentModel; +use app\models\yiiModels\DataFileSearch; use app\models\yiiModels\EventSearch; use app\models\wsModels\WSConstants; use app\components\helpers\SiteMessages; @@ -927,9 +929,7 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { //Get the list of the variables $variables = []; - - //If the experiment URI is empty, we get all the variables. - if (empty($experimentUri)) { + if (empty($experimentUri)) { //If the experiment URI is empty, we get all the variables. $variableModel = new \app\models\yiiModels\YiiVariableModel(); $variables = $variableModel->getInstancesDefinitionsUrisAndLabel($token); } else { //There is an experiment. Get the variables linked to the experiment. @@ -945,7 +945,7 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { SiteMessages::SITE_PAGE_MESSAGE => $variablesSearch]); } } - $variables=$experimentModel->variables; + $variables = $experimentModel->variables; } // Load existing provenances @@ -959,7 +959,51 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { //Search data for the scientific object and the given variable. if (isset($_POST['variable'])) { + $toReturn = []; + /* Build array for highChart with data and photos by provenances + * e.g : + * {"ProvenanceUri1": { + * "data" :[["1500768000000","1,874809"],..], + * "photos":[ + * [{ + * "url":"", + * "date":"", + * "position":""}], + * [{ + * "url":"", + * "date":"", + * "position":""}],... + * + * + * "ProvenanceUri2": { + * "data" :[["1496793600000","2,313261"],..], + * "photos":[ + * [{ + * "url":"", + * "date":"", + * "position":""}], + * [{ + * } + */ + + $data = []; + /* Step 1: Raw data : data from the data W.S. + * e.g : + * [{ + * "provenanceUri": "http://www.opensilex.org/demo/id/provenance/1563795626162", + * "date":"1500768000000", + * "value":"1,874809" + * }],[{ + * "provenanceUri": "http://www.opensilex.org/demo/id/provenance/1563795626162", + * "date":"1501112228000", + * "value":"1,845209" + * }],[{ + * "provenanceUri": "http://www.opensilex.org/demo/id/provenance/1563795500410", + * "date":"1496793600000", + * "value":"2,313261" + * }],[..... + */ $searchModel = new \app\models\yiiModels\DataSearchLayers(); $searchModel->pageSize = 80000; $searchModel->object = $scientificObject->uri; @@ -968,37 +1012,25 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { $searchModel->startDate = $_POST['dateStart']; $searchModel->endDate = $_POST['dateEnd']; $searchModel->provenance = $_POST['provenances']; + $searchModel->dateSortAsc='true'; //FIX HIGHCHARTS WHEN FLAGS IS ATTACHED TO A SERIE $searchResult = $searchModel->search($token, null); - /* Build array for highChart - * e.g : - * { - * "variable": "http:\/\/www.opensilex.org\/demo\/id\/variable\/v0000001", - * "scientificObjectData":{ - * "label": "Scientific object label", - * "dataFromProvenance":{ - * "ProvenanceUri1": [["1,874809","2015-02-10"],..], - * "ProvenanceUri2": [["2,313261","2015-03-15"],..], - * ... - * } - * } - * } - */ - - $data = []; - $scientificObjectData["label"] = $label; foreach ($searchResult->getModels() as $model) { if (!empty($model->value)) { $dataToSave = null; - $provenanceLabel = $provenances[$model->provenanceUri]->label; - $dataToSave["provenanceUri"] = $provenanceLabel . " (prov:" . explode("id/provenance/", $model->provenanceUri)[1] . ")"; + $dataToSave["provenanceUri"] = $model->provenanceUri; $dataToSave["date"] = (strtotime($model->date)) * 1000; $dataToSave["value"] = doubleval($model->value); $data[] = $dataToSave; } } - // Transform to map based to the provenance value - $dataByProvenance = array(); + /* Step 2: Transformed Raw data + * e.g : + * { + * "ProvenanceUri1":[["1498262400000","1,874809"],[],..] + * "ProvenanceUri2":[["1496793600000","2,313261"],..], + * } + */ foreach ($data as $dataEl) { $dataByProvenanceToSave = null; $dataByProvenanceToSave[] = $dataEl['date']; @@ -1006,10 +1038,51 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { $dataByProvenance[$dataEl['provenanceUri']][] = $dataByProvenanceToSave; } - if (!empty($data)) { - $toReturn["variable"] = $searchModel->variable; - $scientificObjectData["dataFromProvenance"] = $dataByProvenance; - $toReturn["scientificObjectData"] = $scientificObjectData; + + /* Step 3: Add photos serie to each provenance or null + * e.g : + * {"ProvenanceUri1": { + * "data" :[["1500768000000","1,874809"],..], + * "photosSerie":[ + * [{ + * "date":"1500768000000", + * "photos": [[url,filtre],[],[],....] }], + * [{ + * "date":"1404896300000", + * "photos": [[url,filtre],[],[],....] }],.., + * ] + * }, + * "ProvenanceUri2": { + * "data" :[["1496793600000","2,313261"],..], + * "photosSerie": null + * } + */ + if (isset($_POST['show']) && isset($_POST['imageType'])) { + + if (isset($_POST['filter']) && $_POST['filter'] !== "") { + $selectedPositionIndex = $_POST['filter']; + $attribut = explode(":", Yii::$app->params['image.filter']['metadata.position'][$selectedPositionIndex]); + $filterToSend = "{'metadata." . $attribut[0] . "':'" . $attribut[1] . "'}"; + } + + foreach ($dataByProvenance as $dataFromProvenanceKey => $dataFromProvenanceValue) { + //functions to search photo for each provenances with good parameters: return the good array / we will buid the images serie + //attach to the provenance + $photosArray = null; + $photosArray = $this->searchImagesByProvenance($dataFromProvenanceKey, $scientificObject->uri, $_POST['imageType'], $filterToSend ? $filterToSend : null, $_POST['dateStart'], $_POST['dateEnd']); + $toReturn[$dataFromProvenanceKey] = [ + 'data' => $dataFromProvenanceValue, + 'photosSerie' => $photosArray, + ]; + } + } else { + foreach ($dataByProvenance as $dataFromProvenanceKey => $dataFromProvenanceValue) { + + $toReturn[$dataFromProvenanceKey] = [ + 'data' => $dataFromProvenanceValue, + 'photosSerie' => null, + ]; + } } //Get the events associate to the sci. obj. to put on the Highcharts Graph @@ -1037,7 +1110,6 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { 'text' => $model->uri ]; } - } //on FORM submitted: //check if image visualization is activated @@ -1045,11 +1117,6 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { $selectedVariable = isset($_POST['variable']) ? $_POST['variable'] : null; $imageTypeSelected = isset($_POST['imageType']) ? $_POST['imageType'] : null; $selectedProvenance = isset($_POST['provenances']) ? $_POST['provenances'] : null; - if (isset($_POST['filter']) && $_POST['filter'] !== "") { - $selectedPositionIndex = $_POST['filter']; - $attribut = explode(":", Yii::$app->params['image.filter']['metadata.position'][$selectedPositionIndex]); - $filterToSend = "{'metadata." . $attribut[0] . "':'" . $attribut[1] . "'}"; - } return $this->render('data_visualization', [ 'model' => $scientificObject, 'variables' => $variables, @@ -1072,6 +1139,58 @@ public function actionDataVisualization($uri, $label, $experimentUri = null) { } } + /** + * Create an associative array of imagesUri[]/date from an scientific object for a specified provenanceUri + * [ + { + "date":"1500768000000", + "photos": [[url,filtre],[],[],....] }, + { + "date":"1404896300000", + "photos": [[url,filtre],[],[],....] },.., + * ] + * @param type $provenanceUri + * @param type $objectUri + * @param type $rdfType + * @param type $filter + * @param type $date + * @return associative array + */ + private function searchImagesByProvenance($provenanceUri, $objectUri, $rdfType, $filter, $startDate, $endDate) { + + $searchImagesModel = new DataFileSearch($pageSize = 8000); + $searchImagesModel->rdfType = $rdfType; + $searchImagesModel->startDate = $startDate; + $searchImagesModel->endDate = $endDate; + $searchImagesModel->concernedItems = [$objectUri]; + $searchImagesModel->jsonValueFilter = $filter; + $searchImagesModel->provenance = $provenanceUri; + $searchResult = $searchImagesModel->search(Yii::$app->session['access_token'], null); + foreach ($searchResult->getModels() as $image) { + $images[] = [ + 'url' => Url::to(['image/get', 'imageUri' => urlencode($image->uri)]), + 'date' => (strtotime($image->date)) * 1000, + 'position' => $image->metadata->position + ]; + } + /* Transformed Raw data + * e.g : + * { + * "Date1":[["url1","1"],["url2","2"],..] + * "Date2":.... + * } + */ + foreach ($images as $imagesEl) { + $imagesByDateToSave = null; + $imagesByDateToSave[] = $imagesEl['url']; + $imagesByDateToSave[] = $imagesEl['position']; + $imagesByDate[$imagesEl['date']][] = $imagesByDateToSave; + } + + + return $imagesByDate; + } + /** * Create an associative array of the provenances objects indexed by their URI * @param type $provenances diff --git a/models/yiiModels/DataFileSearch.php b/models/yiiModels/DataFileSearch.php index f130c219..017951b3 100644 --- a/models/yiiModels/DataFileSearch.php +++ b/models/yiiModels/DataFileSearch.php @@ -18,7 +18,7 @@ * @author Vincent Migot */ class DataFileSearch extends YiiDataFileModel { - + /** * @param string $pageSize number of elements per page * (limited to 150 000) @@ -27,18 +27,18 @@ class DataFileSearch extends YiiDataFileModel { public function __construct($pageSize = null, $page = null) { parent::__construct($pageSize, $page); } - + /** * * @return array the rules of the attributes */ public function rules() { return [ - [['rdfType'], 'required'], - [['concernedItems','jsonValueFilter'], 'safe'] + [['rdfType'], 'required'], + [['concernedItems', 'jsonValueFilter'], 'safe'] ]; } - + /** * * @param array $sessionToken used for the data access @@ -47,12 +47,14 @@ public function rules() { * or string \app\models\wsModels\WSConstants::TOKEN if the user needs to log in */ public function search($sessionToken, $params) { - //1. this load the searched data - $this->load($params); + //1. this load the searched data + if (isset($params)) { + $this->load($params); + } if (isset($params[YiiModelsConstants::PAGE])) { $this->page = $params[YiiModelsConstants::PAGE]; } - + //2. Check validity of search data if (!$this->validate()) { return new ArrayDataProvider(); @@ -62,13 +64,13 @@ public function search($sessionToken, $params) { $params = $this->attributesToArray(); unset($params['uri']); $findResult = $this->find($sessionToken, $params); - if (is_string($findResult)) { return $findResult; - } else if (isset($findResult->{'metadata'}->{'status'}[0]->{'exception'}->{'details'}) - && $findResult->{'metadata'}->{'status'}[0]->{'exception'}->{'details'} === WSConstants::TOKEN_INVALID) { + } else if (isset($findResult->{'metadata'}->{'status'}[0]->{'exception'}->{'details'}) && $findResult->{'metadata'}->{'status'}[0]->{'exception'}->{'details'} === WSConstants::TOKEN_INVALID) { return WSConstants::TOKEN_INVALID; } else { + + return new ArrayDataProvider([ 'models' => $findResult, 'pagination' => [ @@ -78,8 +80,9 @@ public function search($sessionToken, $params) { //SILEX:info //totalCount must be there too to get the pagination in GridView 'totalCount' => $this->totalCount - //\SILEX:info + //\SILEX:info ]); } } + } diff --git a/models/yiiModels/DataSearchLayers.php b/models/yiiModels/DataSearchLayers.php index 59fdaf53..9491fdd9 100644 --- a/models/yiiModels/DataSearchLayers.php +++ b/models/yiiModels/DataSearchLayers.php @@ -29,10 +29,11 @@ class DataSearchLayers extends \app\models\yiiModels\YiiDataModel { /** * @inheritdoc */ + public function rules() { return [ - [['variable', 'startDate', 'endDate', 'provenance', 'object'], 'safe'] + [['variable', 'startDate', 'endDate', 'provenance', 'object','dateSortAsc'], 'safe'] ]; } @@ -89,6 +90,7 @@ public function attributesToArray() { $toReturn["endDate"] = $this->endDate; $toReturn["provenance"] = $this->provenance; $toReturn["pageSize"] = $this->pageSize; + $toReturn["dateSortAsc"] = $this->dateSortAsc; return $toReturn; } diff --git a/models/yiiModels/YiiDataFileModel.php b/models/yiiModels/YiiDataFileModel.php index 49b42448..0377cd14 100644 --- a/models/yiiModels/YiiDataFileModel.php +++ b/models/yiiModels/YiiDataFileModel.php @@ -78,7 +78,7 @@ class YiiDataFileModel extends WSActiveRecord { const PROVENANCE = "provenance"; - + /** * Initialize wsModel. In this class, wsModel is a WSImageModel @@ -159,7 +159,6 @@ public function attributesToArray() { if ($this->provenance != null) { $attributesArray[self::PROVENANCE] = $this->provenance; } - return $attributesArray; } diff --git a/models/yiiModels/YiiDataModel.php b/models/yiiModels/YiiDataModel.php index cd44dd5b..06d102b9 100644 --- a/models/yiiModels/YiiDataModel.php +++ b/models/yiiModels/YiiDataModel.php @@ -43,6 +43,8 @@ class YiiDataModel extends WSActiveRecord { */ public $provenance; + public $dateSortAsc; + /** * * @param string $pageSize number of elements per page diff --git a/views/scientific-object/data_visualization.php b/views/scientific-object/data_visualization.php index ccec987e..59eae1c9 100644 --- a/views/scientific-object/data_visualization.php +++ b/views/scientific-object/data_visualization.php @@ -33,6 +33,7 @@
" . Yii::t('app/messages', 'No variables linked to the experiment of the scientific object.') . "

"; } else { @@ -249,16 +250,72 @@ echo "

" . Yii::t('app/messages', 'No result found.') . "

"; } else { + + + $url2 = Url::to(['image/search-from-scientific-object']); + $objectURI = $model->uri; + $series = []; - foreach ($data["scientificObjectData"]["dataFromProvenance"]as $dataFromProvenanceKey => $dataFromProvenanceValue) { + foreach ($data as $dataFromProvenanceKey => $dataFromProvenanceValue) { + $series[] = [ - 'type' => 'line', - 'name' => $dataFromProvenanceKey, - 'data' => $dataFromProvenanceValue, + 'name' => $provenancesArray[$dataFromProvenanceKey], + 'data' => $dataFromProvenanceValue["data"], + 'id' => $dataFromProvenanceKey, 'visible' => true, ]; - } + if (!empty($dataFromProvenanceValue["photosSerie"])) { + + foreach ($dataFromProvenanceValue["photosSerie"] as $photoKey => $photoValue) { + $info = ""; + foreach ($photoValue as $photoValueEl) { + $info = $info . "
" . $photoValueEl[0] . "
" . $photoValueEl[1]; + } + $photoSerie[] = [ + 'x' => $photoKey, + 'title' => 'I', + ]; + } + $series[] = [ + 'type' => 'flags', + 'name' => 'images', + 'data' => $photoSerie, + // 'allowOverlapX'=> true, + 'onSeries' => $dataFromProvenanceKey, + // 'width' => 16, + 'shape' => 'circlepin', + 'lineWidth' => 1, + // 'y' => -15, + 'events' => [ + 'click' => new JsExpression(" + function (event) { + console.log( \"$model->uri\");" + . " console.log(event.point.x);" + . " console.log(\"$dataFromProvenanceKey\");" + . " var searchFormData = new FormData();" + . " searchFormData.append('concernedItems[]', \"$objectURI\");" + . " searchFormData.append('DataFileSearch[rdfType]',\"$imageTypeSelected\");" + . " searchFormData.append('jsonValueFilter', \"$filterToSend\");" + . " searchFormData.append('startDate',Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0000', event.point.x));" + . " searchFormData.append('endDate',Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0000', event.point.x));" + . " searchFormData.append('imagesCount',$('#imagesCount').attr('data-id'));" + . " $.ajax({" + . " url: \"$url2\"," + . " type: 'POST'," + . " processData: false," + . " datatype: 'json'," + . " contentType: false," + . " data: searchFormData," + . " }" + . " ).done(function (data) {onDayImageListHTMLFragmentReception(data);}" + . " ).fail(function (jqXHR, textStatus) {alert('ERROR : ' + jqXHR);});}" + . "") + ] + ]; + } + } + //var_dump($series);exit; foreach ($events as $event) { $Eventsdata[] = [ 'x' => $event['date'], @@ -277,18 +334,16 @@ ]; $series[] = $eventsTab[0]; - - - $url2 = Url::to(['image/search-from-scientific-object']); - $objectURI = $model->uri; $options = [ 'id' => 'graphic', 'options' => [ 'chart' => [ 'zoomType' => 'x', + 'type' => 'line' ], + 'title' => [ - 'text' => $variables[$data["variable"]] + 'text' => $this->title ], 'subtitle' => [ 'text' => Yii::t('app/messages', 'Click and drag in the plot area to zoom in!') @@ -307,11 +362,11 @@ 'text' => 'time' ], 'ordinal' => false, - 'crosshair' => false, + 'crosshair' => true, ], 'yAxis' => [ 'title' => [ - 'text' => $variables[$data["variable"]] + 'text' => $this->title ], 'labels' => [ 'format' => '{value:.2f}' @@ -320,16 +375,15 @@ 'series' => $series, 'tooltip' => [ 'xDateFormat' => '%Y-%m-%d %H:%M', - ], 'plotOptions' => [ 'series' => [ 'dataGrouping' => [ 'enabled' => false ], - 'cursor' => 'pointer', + // 'cursor' => 'pointer', 'marker' => [ - 'enabled' => false, + // 'enabled' => false, 'states' => [ 'hover' => [ 'enabled' => true @@ -362,25 +416,25 @@ function (event) { ] ]; - if ($show) { - $options['options']['plotOptions']['series']['point']['events']['click'] = new JsExpression(" function() {" - . "var searchFormData = new FormData();" - . "console.log( Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0200', 1500768000000));" - . "searchFormData.append('concernedItems[]', \"$objectURI\");" - . "searchFormData.append('DataFileSearch[rdfType]',\"$imageTypeSelected\");" - . "searchFormData.append('jsonValueFilter', \"$filterToSend\");" - . "searchFormData.append('startDate',Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0000', this.x));" - . "searchFormData.append('endDate',Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0000', this.x));" - . "searchFormData.append('imagesCount',$('#imagesCount').attr('data-id'));" - . "$.ajax({url: \"$url2\"," - . " type: 'POST'," - . " processData: false," - . " datatype: 'json'," - . " contentType: false," - . " data: searchFormData," - . "}).done(function (data) {onDayImageListHTMLFragmentReception(data);} - ).fail(function (jqXHR, textStatus) {alert('ERROR : ' + jqXHR);});}"); - } +// if ($show) { +// $options['options']['plotOptions']['series']['point']['events']['click'] = new JsExpression(" function() {" +// . "var searchFormData = new FormData();" +// . "console.log( Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0200', 1500768000000));" +// . "searchFormData.append('concernedItems[]', \"$objectURI\");" +// . "searchFormData.append('DataFileSearch[rdfType]',\"$imageTypeSelected\");" +// . "searchFormData.append('jsonValueFilter', \"$filterToSend\");" +// . "searchFormData.append('startDate',Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0000', this.x));" +// . "searchFormData.append('endDate',Highcharts.dateFormat('%Y-%m-%dT%H:%M:%S+0000', this.x));" +// . "searchFormData.append('imagesCount',$('#imagesCount').attr('data-id'));" +// . "$.ajax({url: \"$url2\"," +// . " type: 'POST'," +// . " processData: false," +// . " datatype: 'json'," +// . " contentType: false," +// . " data: searchFormData," +// . "}).done(function (data) {onDayImageListHTMLFragmentReception(data);} +// ).fail(function (jqXHR, textStatus) {alert('ERROR : ' + jqXHR);});}"); +// } echo Highstock::widget($options); } } @@ -428,6 +482,7 @@ function (event) {
+test