Update Chart.js with interactive feature and add table column sorting

[bjarnef]

Updated Charts.js to newer version with interactive features and some other minor changes.

[bjarnef]

Maybe also add clear: both; to <div id="countryChart"> so map not overlap datepicker in right corner and you see the bottom border of the datepicker too or add a <div style="clear:both"></div> just below <h4> in the views so the content and progressbar always comes below the title and datepicker.

[warrenbuckley]

Hi @bjarnef, Did you do your suggestion above with the CSS clear with the map?

If you haven't added it in, can you do so please, then I can merge it in later today & do a patch release tonight or tomorrow then :+1:

[bjarnef]

No, I just noticed it after sending the pull request :)

But it was you in every partial view https://github.com/warrenbuckley/Analytics/tree/master/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials .. where there could be added a clear:both; between h4 and the loadingViews. if there already is a clearBoth or clearfix class could it just be used:

<div ng-model="dateFilter" date-range-picker class="pull-right" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc">
</div>

<h4>Browser</h4>

<div style="clear:both;"></div>
<div ng-show="loadingViews">
    <div class="umb-loader" style="height: 10px; margin: 10px 0px;"></div>
</div>

[warrenbuckley]

Well the Umbraco core are using Bootstrap 2, which I believe has some form of clearfix CSS class from memory.

[bjarnef]

In OAuthCallback.aspx there is included the stylesheet /umbraco/assets/css/umbraco.css, which have a clearfix.

So if you include the css in the views and then write this, it should work:

<div ng-model="dateFilter" date-range-picker class="pull-right" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc">
</div>

<h4>Browser</h4>

<div class="clearfix"></div>
<div ng-show="loadingViews">
    <div class="umb-loader" style="height: 10px; margin: 10px 0px;"></div>
</div>

[bjarnef]

The comments I wrote are now included in the changes and I also added table column sorting.. there is a minor issue with table sorting that affect each other, when having multiple columns on same page.. do you have an idea of how to "isolate" the sorting for only the specific table?

Furthermore I think the root node (Analytics) is missing to link to the dashboard view?

[warrenbuckley]

@bjarnef So just finished reviewing. Overall a great Pull Request with some great fixes & additions. If you don;'t mind addressing a few issues I raised regarding repeition & naming consitancey then more than happy to merge it in :+1:

[warrenbuckley]

@bjarnef Are you able to do the suggestions I have recommended or you too busy, or do not understand my suggestions then let me know.

[bjarnef]

I'll take a look at some of your suggestions.. on others I think my skills are a bit limited.. but will see what I can do :)

[warrenbuckley]

@bjarnef have you looked into my suggestions at all or do you need some help from me or anyone else in the team?

Cheers, Warren

[bjarnef]

Not much since some of the last commits .. I looked a bit into the currency filter, but didn't get it working, when registrering the filter in a separate file. But if you have some time you're welcome to modify my changes with some improvements. Feel free to change, where you think the code could be optimized or written in a better way :)

[warrenbuckley]

@bjarnef OK I will try & take a look at some point this week so we can get this awesome work in. (Won't be tomorrow as it's a UK public holiday)