Skip to content

Event visualization 2 #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jbonnefont wants to merge 24 commits into
base: master
Choose a base branch
from
Open

Event visualization 2 #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
14abf16
change highcharts to highstock- get the events from WS - events on th…
jbonnefont Sep 27, 2019
0d7bfa5
optimisation
jbonnefont Sep 30, 2019
c2936bd
little changes on images rendering
jbonnefont Sep 30, 2019
3999d76
events flag highstocks: on datagrouping false effect & time axis bug:
jbonnefont Sep 30, 2019
dd5db3b
events visualization: catch exception on EventSearch to search events…
jbonnefont Oct 1, 2019
8b39a12
start the branch
jbonnefont Oct 2, 2019
1c0bacc
Merge branch 'master' into event-visualization-2
jbonnefont Oct 2, 2019
f1a6077
clic event on the serie- start the create popup - some exception/toke…
jbonnefont Oct 3, 2019
f7c0964
stuff
jbonnefont Oct 4, 2019
e10821e
Images serie attached to data serie- images visualization on click
jbonnefont Oct 9, 2019
2567464
hover effect on images to see the flags on graphic
jbonnefont Oct 9, 2019
39f25f5
Add create event action + change submit action on visualized from PO…
jbonnefont Oct 10, 2019
9431a0a
highlight images on graphic points hover + start to add events view l…
jbonnefont Oct 11, 2019
11b7777
Show events details on popup (clic on event's flag) : first part
jbonnefont Oct 14, 2019
c93109c
hide tootip on photo's flag+ custom color of flags
jbonnefont Oct 14, 2019
61ab866
little ergonomic changes / delete the detail view modal on Events fla…
jbonnefont Oct 15, 2019
4d17ed3
set allowOverlapX to false on Events flag serie + Set Zoom to XY
jbonnefont Oct 15, 2019
df298c9
stuff
jbonnefont Oct 15, 2019
ac5f852
fix events flag superpose at same date : highstock needs ordered dates
jbonnefont Oct 15, 2019
5f2672b
Add detail events modal on the event's flag clic
jbonnefont Oct 15, 2019
1cd3dd7
variable label on the y axis label and graphic title
jbonnefont Oct 16, 2019
d96dfee
internationalization+comment
jbonnefont Oct 16, 2019
e3b35ba
Fix provenances/data link
jbonnefont Oct 18, 2019
f50a45e
Changes before pull request
jbonnefont Feb 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions components/widgets/event/EventButtonWidget.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'];
Expand Down
5 changes: 4 additions & 1 deletion config/params.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

];
Loading