Commit Graph

160 Commits (fixGeoReader)

Author SHA1 Message Date
Sami Mokaddem 85aee0dd9a feature: Added legend in pie chart 2017-11-17 16:12:56 +01:00
Sami Mokaddem ec3a6811ee UI: update 2017-11-17 15:57:50 +01:00
Sami Mokaddem f55ad8255c fix and feature: Added data ordering in reids (useing orderedDico) +
Added sightings in UI + colored charts woth tag color"
2017-11-17 14:45:20 +01:00
Sami Mokaddem 074998c227 UI: update 2017-11-17 11:57:32 +01:00
Sami Mokaddem ec3ec66fa7 UI: Added margin for items in legends 2017-11-17 10:46:25 +01:00
Sami Mokaddem 3d1d4c29ca Support of hover in pie and line charts 2017-11-17 10:41:22 +01:00
Sami Mokaddem 1ca3c7aeba Merge branch 'users' into trendings 2017-11-17 09:57:48 +01:00
Sami Mokaddem 1ca2a48262 Fix: fixed bug displaying data from another source 2017-11-17 09:57:29 +01:00
Sami Mokaddem e57018c799 Better display on linechart 2017-11-17 09:43:59 +01:00
Sami Mokaddem b53f9fdf4b Feature: Date range replace fixed date + formatted labels 2017-11-17 09:13:18 +01:00
Sami Mokaddem a5f4306489 Text label with correct format + Linked x overtime (linechart) 2017-11-16 16:57:48 +01:00
Sami Mokaddem 5779eb53c4 Merge branch 'users' into trendings 2017-11-16 15:11:04 +01:00
Sami Mokaddem 8daa9e4364 Fix: setupgrid forgotten + bad contition 2017-11-16 15:10:29 +01:00
Sami Mokaddem 8942a43c18 Added linked pie plot with server 2017-11-16 15:08:14 +01:00
Sami Mokaddem 71837d3308 Added trendings template 2017-11-16 12:23:02 +01:00
Sami Mokaddem 82346e8782 Split js and html 2017-11-15 15:58:16 +01:00
Sami Mokaddem 2b3a5be907 Start of linking fame quality 2017-11-14 15:44:53 +01:00
Sami Mokaddem 8eae00f6b5 Fixed bug json parsing in server + continuation of trophy support in zmq 2017-11-14 14:56:15 +01:00
Sami Mokaddem f22aaee21d Draft support of trophies in ZMQ 2017-11-14 14:05:54 +01:00
Sami Mokaddem c13e39d5a6 added latestAwards + started trophy ranks 2017-11-14 09:50:20 +01:00
Sami Mokaddem 70561357c3 Draft eventSource lastAwards 2017-11-13 16:26:09 +01:00
Sami Mokaddem c35fbe969b Started new contrib layout (latest awards + 2 fames tabs) + fixed bug searching org (caused by the switch to link) 2017-11-13 16:02:09 +01:00
Sami Mokaddem f59aac98d7 Continuation of trophy intergration 2017-11-13 15:19:30 +01:00
Sami Mokaddem 0bc0683924 Started support of organisation trophies 2017-11-13 12:57:05 +01:00
Sami Mokaddem 6b85144164 Updated org contrib. overtime to display the date 2017-11-10 11:15:31 +01:00
Sami Mokaddem 0080de3d8e better display for badges and time 2017-11-10 10:32:51 +01:00
Sami Mokaddem 46d389c210 Added display of datetime in last contributors 2017-11-10 09:56:41 +01:00
Sami Mokaddem cb53be4253 Prevent double display of org in line chart 2017-11-10 09:22:46 +01:00
Sami Mokaddem b0a83a9ebd Added support of previous date from getCategPerContrib 2017-11-10 09:00:50 +01:00
Sami Mokaddem a3c853e490 Updated ranking level decision + updated support of message for zmq + Updated badge acquisition display to match data in DB 2017-11-09 16:31:04 +01:00
Sami Mokaddem 1550f25b30 fixed bugs if requesting data from non-existing org + refined draft updateOrgContributionRank + Fixed non existing org logo + try in zmq_subscribe 2017-11-09 13:43:02 +01:00
Sami Mokaddem cc766d7b04 Updated non-test function + minor UI fix 2017-11-09 10:58:18 +01:00
Sami Mokaddem 97a9020716 Added draft support of org overtime + Added clickable orgName + minor fix in live dashbaord + draft support of sighting in zmq_sub 2017-11-09 10:32:39 +01:00
Sami Mokaddem 10c59fc220 Added overtake remaining points + moved updateOrgContributionRank from zmq_subscribe to contributor_helper 2017-11-08 17:37:03 +01:00
Sami Mokaddem 93ce25946d Fixed UI row color bug + Added total org points and row color legends 2017-11-08 16:12:42 +01:00
Sami Mokaddem 605538ce97 Added display of conribution rank statys + acquired badges 2017-11-08 15:34:02 +01:00
Sami Mokaddem 90a518cc07 Added support of honorBadge + Added text related to global ranking requirements 2017-11-08 11:29:07 +01:00
Sami Mokaddem a337ee1a85 Added pic centering in lastDataTable 2017-11-07 12:59:32 +01:00
Sami Mokaddem 41b4bee917 Added organisation global ranking dipslay 2017-11-07 12:54:08 +01:00
Sami Mokaddem a65d4d26a5 slight img size modif 2017-11-06 18:44:51 +01:00
Sami Mokaddem 70c268d20e Added support of org logo 2017-11-06 18:40:44 +01:00
Sami Mokaddem 50a1a349da Updated test data + increased rank icon size 2017-11-06 18:07:10 +01:00
Sami Mokaddem 798bd9d6c9 Changed UI color style 2017-11-06 16:09:29 +01:00
Sami Mokaddem 671c8f2608 Added rank logo (png & svg) 2017-11-06 15:31:41 +01:00
Sami Mokaddem 79cf989512 Added contribution page auto-reload 2017-11-06 15:00:51 +01:00
Sami Mokaddem 58c187d0d5 Auto update of headerOrg (Pb and rank panel) 2017-11-06 13:52:08 +01:00
Sami Mokaddem cba6d260ff Added draft of automatic update for lastContributor 2017-11-06 13:43:55 +01:00
Sami Mokaddem 85d7d10df5 Added support of org in URL GET param 2017-11-06 09:58:59 +01:00
Sami Mokaddem 264a4e52e2 Draft getting contribution info from redis 2017-11-06 09:50:28 +01:00
Sami Mokaddem 76d93ecda8 Improved ranking sheet with overall progression 2017-11-03 08:55:03 +01:00
Sami Mokaddem be20f75ad8 Other UI adjustement 2017-11-02 16:21:04 +01:00
Sami Mokaddem 4e396d2eb3 Added support of custom categories from config 2017-11-02 16:10:40 +01:00
Sami Mokaddem 6f3998df68 Support of out-of-bound rank for PB 2017-11-02 15:27:31 +01:00
Sami Mokaddem eb9719e5ff Better support of custom scale ranking 2017-11-02 15:14:21 +01:00
Sami Mokaddem cb674a770d Added PB showing pnts # of pnts to get for the next lvl 2017-11-02 14:44:27 +01:00
Sami Mokaddem 3bfa5185dc Few additional ui adjustement + filtering categ feature on button click 2017-11-02 14:02:54 +01:00
Sami Mokaddem aabd4779f9 Added row coloring for selected ORG 2017-11-02 13:13:13 +01:00
Sami Mokaddem eed0528f52 Put rankLvl multiplier in config + fixed bug log 0 2017-11-02 11:47:52 +01:00
Sami Mokaddem 2685a08019 Added support of rank from org points 2017-11-02 11:36:23 +01:00
Sami Mokaddem 8e2b5477f2 Dynamic update iof org rank in header 2017-11-02 10:57:16 +01:00
Sami Mokaddem cfd1818a33 Added ranking table 2017-11-02 10:16:34 +01:00
Sami Mokaddem 1ae827d202 Moved js and css in their own scripts 2017-11-02 08:41:30 +01:00
Sami Mokaddem 4bff4880aa Added direct zoom in live dashboard 2017-10-30 11:07:41 +01:00
Sami Mokaddem 9f942ded9c Added support of TAG albel in live dashboard 2017-10-30 10:44:12 +01:00
Sami Mokaddem b4b15bb565 Fixed a bug trying to delete a not existing marker (geo) + Fixed leaflet dependencies to use local script instead of remote 2017-10-30 09:29:18 +01:00
Sami Mokaddem 3b7e66ec7a STILL MESSING WITH DEPS 2017-10-27 22:44:46 +02:00
Sami Mokaddem 9812dbe2b1 Cheating with deps 2 2017-10-27 22:24:14 +02:00
Sami Mokaddem f397378736 cheating with deps 2017-10-27 22:20:35 +02:00
Sami Mokaddem 51bd4088d6 Fixing deps 2017-10-27 22:05:12 +02:00
Sami Mokaddem 2d09ee87f6 switching to globalRedis + harmonization ui live-dashboard 2017-10-27 16:36:27 +02:00
Sami Mokaddem 7b1afdc60e Fixed bug marker from streetLocation not removing 2017-10-27 16:16:40 +02:00
Sami Mokaddem 62522f822f Loads of bug fixes: Added possibility to plot any field in lineChart + Fixed bug GEO where data was not from the correct date + Clear view when no data + Probably solved unsorted dic stored in redis + Support of publish_event_to_zmq 2017-10-27 15:33:09 +02:00
Sami Mokaddem c566cea338 Added possibility to display any fields form zmq + possibility to display for objects 2017-10-27 13:19:22 +02:00
Sami Mokaddem 38c0eef615 UI typo 2017-10-27 09:59:12 +02:00
Sami Mokaddem f52890e382 GEO: Moved options in config + Moved javascript in its own file 2017-10-27 09:36:39 +02:00
Sami Mokaddem 6c7916b5be UI attunement - Possibility to adjust with of panels in config, immediatly change text. Bit of zmq refacto 2017-10-25 12:12:14 +02:00
Sami Mokaddem 6425fc711e Added support of named ZMQ + automatic Led colors in dashboard 2017-10-25 10:41:46 +02:00
Sami Mokaddem 939d1783df switched lineChart to show category overtime 2017-10-24 17:28:56 +02:00
Sami Mokaddem 3a579b7329 Color less flashy 2017-10-24 17:09:32 +02:00
Sami Mokaddem d012dd77f5 Added regionColor + fixed bug zmq_sub 2017-10-24 17:07:47 +02:00
Sami Mokaddem 99542c5316 Added multiple fields in dataTable row 2017-10-24 15:17:52 +02:00
Sami Mokaddem ddb5dbc773 Added points in lineChart 2017-10-24 12:21:50 +02:00
Sami Mokaddem 6abc6fe9e4 Fixed marker bug + fixed bug multiple attributes from event 2017-10-24 12:17:10 +02:00
Sami Mokaddem e3cefa45da Moved more to config + Added orange led 2017-10-24 09:32:23 +02:00
Sami Mokaddem 366f1d826e Auto-reconnect if event source connection lost 2017-10-23 17:50:56 +02:00
Sami Mokaddem 13305e627f Added location reload if eventSource loose connection 2017-10-23 17:31:33 +02:00
Sami Mokaddem 14103fb0a7 Added led feed indicator 2017-10-23 17:25:41 +02:00
Sami Mokaddem d24a41cf39 Added zoom selector 2017-10-23 16:56:25 +02:00
Sami Mokaddem 2b6e696548 Added rotation speed selector 2017-10-23 16:34:14 +02:00
Sami Mokaddem d80aa1e7a3 Moved more to config 2017-10-23 15:44:16 +02:00
Sami Mokaddem ef01072944 Moved const var to config + linechart shift to hours (and current values) 2017-10-23 15:32:44 +02:00
Sami Mokaddem 4d0136bdb8 Removed code duplication 2017-10-23 14:48:59 +02:00
Sami Mokaddem 5c5b27fc2d Added city&country in marker + autoRotation on event 2017-10-23 14:38:47 +02:00
Sami Mokaddem 89fd7268db Manage map from classes + Added more event info in zmq feed 2017-10-23 12:01:48 +02:00
Sami Mokaddem 7ddd9bb092 Fixed introduced bug where line plot was not moving 2017-10-20 17:09:01 +02:00
Sami Mokaddem 00e2e7bd6a Splitted index script into sub_scripts 2017-10-20 15:09:53 +02:00
Sami Mokaddem 801a9111ce Usage of openStreetMap js library 2017-10-20 14:31:10 +02:00
Sami Mokaddem b4d8699e6a Added pinging + map rotation 2017-10-13 16:48:03 +02:00
Sami Mokaddem 7f9ded5262 Started support of MISP ZMQ 2017-10-13 15:03:09 +02:00
Sami Mokaddem aec6fa2603 Added small text on top of maps pics + Do not write in a file for parallel 2017-10-11 11:24:59 +02:00