Visualization annotation so

components/widgets/AnnotationGridViewWidget.php

@@ -1,11 +1,13 @@
 <?php
+
 //******************************************************************************
 //                         AnnotationGridViewWidget.php
 // SILEX-PHIS
 // Copyright © INRA 2018
 // Creation date: 23 Aug. 2018
 // Contact: arnaud.charleroy@inra.fr, anne.tireau@inra.fr, pascal.neveu@inra.fr
 //******************************************************************************
+
 namespace app\components\widgets;
 
 use yii\base\Widget;
@@ -18,14 +20,15 @@
 
 /**
  * Annotation grid view widget.
+ * @update [Bonnefont Julien] 8 Novembre, 2019: add an easy reading format to the date and type
  * @author Arnaud Charleroy <arnaud.charleroy@inra.fr>
  */
 class AnnotationGridViewWidget extends Widget {
 
     CONST ANNOTATIONS = "annotations";
     CONST NO_LINKED_ANNOTATIONS = "No linked Annotation(s)";
     CONST LINKED_ANNOTATIONS = "Linked Annotation(s)";
-    
+
     /**
      * Define the annotations list which will be showed
      * @var mixed
@@ -50,47 +53,49 @@ public function run() {
         } else {
             $htmlRendered = "<h3>" . Yii::t('app', self::LINKED_ANNOTATIONS) . "</h3>";
             $htmlRendered .= GridView::widget([
-                'dataProvider' => $this->annotations,
-                'columns' => [
-                    [
-                        'label' => Yii::t('app',YiiAnnotationModel::BODY_VALUES_LABEL),
-                        'attribute' => YiiAnnotationModel::BODY_VALUES,
-                        'value' => function ($model) {
-                            return implode(("<br />"), $model->bodyValues);
-                        },
-                        'format' => 'raw',
-                    ],
-                    YiiAnnotationModel::CREATOR =>
-                    [
-                        'label' => Yii::t('app',YiiAnnotationModel::CREATOR_LABEL),
-                        'attribute' => YiiAnnotationModel::CREATOR,
-                        'value' => function($model) {
-                            return Vocabulary::prettyUri($model->creator);
-                        },
-                    ],
-                    YiiAnnotationModel::MOTIVATED_BY => 
-                    [
-                        'label' => Yii::t('app',YiiAnnotationModel::MOTIVATED_BY_LABEL),
-                        'attribute' => YiiAnnotationModel::MOTIVATED_BY,
-                        'value' => function($model) {
-                            return Vocabulary::prettyUri($model->motivatedBy);
-                        }
-                    ],
-                    [
-                        'label' => Yii::t('app',YiiAnnotationModel::CREATION_DATE_LABEL),
-                        'attribute' => YiiAnnotationModel::CREATION_DATE
-                    ],
-                    ['class' => 'yii\grid\ActionColumn',
-                        'template' => '{view}',
-                        'buttons' => [
-                            'view' => function($url, $model, $key) {
-                                return Html::a(Icon::show('eye-open', [], Icon::BSG), ['annotation/view', 'id' => $model->uri]);
-                            },
-                        ]
-                    ],
-                ],
+                        'dataProvider' => $this->annotations,
+                        'columns' => [
+                            [
+                                'label' => Yii::t('app', YiiAnnotationModel::BODY_VALUES_LABEL),
+                                'attribute' => YiiAnnotationModel::BODY_VALUES,
+                                'value' => function ($model) {
+                                    return implode(("<br />"), $model->bodyValues);
+                                },
+                                'format' => 'raw',
+                            ],
+                            YiiAnnotationModel::CREATOR =>
+                            [
+                                'label' => Yii::t('app', YiiAnnotationModel::CREATOR_LABEL),
+                                'attribute' => YiiAnnotationModel::CREATOR,
+                                'value' => function($model) {
+                                    return explode("agent/", $model->creator)[1];
+                                },
+                            ],
+                            YiiAnnotationModel::MOTIVATED_BY =>
+                            [
+                                'label' => Yii::t('app', YiiAnnotationModel::MOTIVATED_BY_LABEL),
+                                'attribute' => YiiAnnotationModel::MOTIVATED_BY,
+                                'value' => function($model) {
+                                    return explode("#", $model->motivatedBy)[1];
+                                }
+                            ],
+                            [
+                                'label' => Yii::t('app', YiiAnnotationModel::CREATION_DATE_LABEL),
+                                'format' => ['date', 'php:Y-m-d H:i'],
+                                'attribute' => YiiAnnotationModel::CREATION_DATE
+                            ],
+                            ['class' => 'yii\grid\ActionColumn',
+                                'template' => '{view}',
+                                'buttons' => [
+                                    'view' => function($url, $model, $key) {
+                                        return Html::a(Icon::show('eye-open', [], Icon::BSG), ['annotation/view', 'id' => $model->uri]);
+                                    },
+                                ]
+                            ],
+                        ],
             ]);
         }
         return $htmlRendered;
     }
+
 }

components/widgets/PropertyWidgetWithActions.php

@@ -19,4 +19,12 @@
  * @author Andréas Garcia <andreas.garcia@inra.fr>
  */
 class PropertyWidgetWithActions extends PropertyWidget {
+    protected function renderValue($value): string {
+
+    }
+
+    protected function renderValues($values): string {
+
+    }
+
 }

components/widgets/event/DetailEventGridViewWidget.php

@@ -0,0 +1,111 @@
+<?php
+
+//******************************************************************************
+//                            EventGridViewWidget.php
+// SILEX-PHIS
+// Copyright © INRA 2019
+// Creation date: 5 Mar. 2019
+// Contact: julien.bonnefont@inra.fr, anne.tireau@inra.fr, pascal.neveu@inra.fr
+//******************************************************************************
+
+namespace app\components\widgets\event;
+
+use yii\base\Widget;
+use yii\helpers\Html;
+use yii\grid\GridView;
+use Yii;
+use app\models\yiiModels\YiiEventModel;
+use kartik\icons\Icon;
+
+/**
+ * Detail Event GridView widget.
+ * @author Julien Bonnefont <julien.bonnefont@inra.fr>
+ */
+class DetailEventGridViewWidget extends Widget {
+
+    const EVENTS_LABEL = "Events";
+    const NO_EVENT_LABEL = "No events";
+    const EVENTS_ARE_NOT_SET_LABEL = "Events aren't set";
+    const HTML_CLASS = "event-widget";
+
+    /**
+     * Defines the list of events to show.
+     * @var mixed
+     */
+    public $dataProvider;
+
+    const DATA_PROVIDER = "dataProvider";
+
+    public function init() {
+        parent::init();
+        // must be not null
+        if ($this->dataProvider === null) {
+            throw new \Exception(self::EVENTS_ARE_NOT_SET_LABEL);
+        }
+    }
+
+    /**
+     * Renders the list of the concerned items.
+     * @return string the HTML string rendered
+     */
+    public function run() {
+        if ($this->dataProvider->getCount() == 0) {
+            $htmlRendered = "<h3>" . Yii::t('app', self::NO_EVENT_LABEL) . "</h3>";
+        } else {
+            $htmlRendered = "<h3>" . Yii::t('app', self::EVENTS_LABEL) . "</h3>";
+            $htmlRendered .= GridView::widget([
+                        'dataProvider' => $this->dataProvider,
+                        'columns' => [
+                            [
+                                'label' => Yii::t('app', 'Type'),
+                                'attribute' => YiiEventModel::TYPE,
+                                'value' => function ($model) {
+                                    return explode("#", $model->rdfType)[1];
+                                }
+                            ],
+                            [
+                                'label' => Yii::t('app', YiiEventModel::ANNOTATIONS),
+                                'attribute' => YiiEventModel::ANNOTATIONS,
+                                'format' => 'html',
+                                'value' => function ($model) {
+
+                                    $annotations = $model->annotations;
+
+                                    $toReturn = '';
+                                    $marginLeft = 0;
+                                    foreach ($annotations as $annotation) {
+
+                                        $toReturn .= '<div class="well well-lg" style="margin:0px 0px 5px ' . $marginLeft . 'px;">';
+                                        foreach ($annotation['bodyValues'] as $i => $value) {
+                                            $toReturn .= $value . ' ';
+                                        }
+                                        $marginLeft += 10;
+                                        $toReturn .= '<div class="pull-right">';
+                                        $toReturn .= date('d/m/Y H:i', strtotime($annotation['creationDate']));
+                                        $toReturn .= '</div></div>';
+                                    }
+                                    return $toReturn;
+                                }
+                            ],
+                            [
+                                'format' => ['date', 'php:d/m/Y H:i'],
+                                'attribute' => YiiEventModel::DATE
+                            ],
+                            [
+                                'class' => 'yii\grid\ActionColumn',
+                                'template' => '{view}',
+                                'buttons' => [
+                                    'view' => function($url, $model, $key) {
+                                        return Html::a(
+                                                        Icon::show('eye-open', [], Icon::BSG), ['event/view', 'id' => $model->uri]);
+                                    },
+                                ]
+                            ],
+                        ],
+                        'options' => ['class' => self::HTML_CLASS]
+            ]);
+        }
+        return $htmlRendered;
+    }
+
+}

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 = '<span class="fa fa-flag"></span>';
+            $linkLabel =Icon::show('flag', ['class'=>$this->size], Icon::FA);
         } 
         if(!isset($this->type)){
             $linkAttributes = ['class' => 'btn btn-default'];

components/widgets/event/EventGridViewWidget.php

@@ -59,7 +59,7 @@ public function run() {
                         'label' => Yii::t('app', YiiEventModel::TYPE),
                         'attribute' => YiiEventModel::TYPE,
                         'value' => function ($model) {
-                            return Vocabulary::prettyUri($model->rdfType);
+                            return explode("#", $model->rdfType)[1];
                         }
                     ],
                     [

config/params.php

@@ -142,11 +142,14 @@
             'labelView:side90','labelView:side120','labelView:side150','labelView:side180','labelView:side210',
             'labelView:side240','labelView:side270','labelView:side300','labelView:side330',
             ],
-        ]
+        ],
 //     // Image filters GENERIC
 //    'image.filter' => [
 //        'metadata.position' => [
 //            'label1:value1','label2:value2', 'label3:value3'],
 //        ]
+    //Highcharts color 
+    'highchartsColor' =>["#7cb5ec", "#434348", "#90ed7d", "#f7a35c", "#8085e9", "#f15c80", "#e4d354", "#2b908f",
+                "#f45b5b", "#91e8e1", "#7cb5ec", "#434348", "#90ed7d", "#f7a35c", "#8085e9", "#f15c80", "#e4d354", "#2b908f", "#f45b5b", "#91e8e1"]
 
 ];

controllers/AnnotationController.php

@@ -56,6 +56,7 @@ public function actionCreate($attributes = null) {
             $dataToSend[] = $annotationModel->attributesToArray();
             // Send data
             $requestRes = $annotationModel->insert($sessionToken, $dataToSend);
+
             if (is_string($requestRes) && $requestRes === \app\models\wsModels\WSConstants::TOKEN_INVALID) { // User must be connected
                 return $this->redirect(Yii::$app->urlManager->createUrl("site/login"));
             } else {
@@ -94,8 +95,7 @@ public function actionIndex() {
         // Load user instances list
         $userModel = new YiiUserModel();
         $users = $userModel->getPersonsURIAndName(Yii::$app->session[\app\models\wsModels\WSConstants::ACCESS_TOKEN]);
-
-        // Load once motivation instances list
+         // Load once motivation instances list
         $motivationInstances = $this->getMotivationInstances();
         if (is_string($searchResult)) {
             if ($searchResult === \app\models\wsModels\WSConstants::TOKEN_INVALID) {