Changeset - ecbb597c336c
[Not reviewed]
default
0 2 0
Andrew Shadura - 11 years ago 2015-03-21 16:08:16
andrew@shadura.me
stats: fix display when no data ready yet

* jQ uses .append(), not .appendChild()
* when no data ready, display a nice message
* rephrase the message, the data isn't ready, not hasn't loaded yet
2 files changed with 6 insertions and 3 deletions:
0 comments (0 inline, 0 general)
kallithea/controllers/summary.py
Show inline comments
 
@@ -163,49 +163,49 @@ class SummaryController(BaseRepoControll
 
            c.no_data = False is c.db_repo.enable_statistics
 
            lang_stats_d = json.loads(stats.languages)
 

	
 
            lang_stats = ((x, {"count": y,
 
                               "desc": LANGUAGES_EXTENSIONS_MAP.get(x)})
 
                          for x, y in lang_stats_d.items())
 

	
 
            c.trending_languages = json.dumps(
 
                sorted(lang_stats, reverse=True, key=lambda k: k[1])[:10]
 
            )
 
        else:
 
            c.no_data = True
 
            c.trending_languages = json.dumps({})
 
            c.trending_languages = json.dumps([])
 

	
 
        c.enable_downloads = c.db_repo.enable_downloads
 
        c.readme_data, c.readme_file = \
 
            self.__get_readme_data(c.db_repo)
 
        return render('summary/summary.html')
 

	
 
    @LoginRequired()
 
    @NotAnonymous()
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
 
                                   'repository.admin')
 
    @jsonify
 
    def repo_size(self, repo_name):
 
        if request.is_xhr:
 
            return c.db_repo._repo_size()
 
        else:
 
            raise HTTPBadRequest()
 

	
 
    @LoginRequired()
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
 
                                   'repository.admin')
 
    def statistics(self, repo_name):
 
        if c.db_repo.enable_statistics:
 
            c.show_stats = True
 
            c.no_data_msg = _('No data loaded yet')
 
            c.no_data_msg = _('No data ready yet')
 
        else:
 
            c.show_stats = False
 
            c.no_data_msg = _('Statistics are disabled for this repository')
 

	
 
        td = date.today() + timedelta(days=1)
 
        td_1m = td - timedelta(days=calendar.mdays[td.month])
 
        td_1y = td - timedelta(days=365)
 

	
 
        ts_min_m = mktime(td_1m.timetuple())
 
        ts_min_y = mktime(td_1y.timetuple())
 
        ts_max_y = mktime(td.timetuple())
 
        c.ts_min = ts_min_m
kallithea/templates/summary/summary.html
Show inline comments
 
@@ -374,23 +374,26 @@ $(document).ready(function(){
 

	
 
            lnk.href='#';
 
            lnk.innerHTML = "${_('Show more')}";
 
            lnk.id='code_stats_show_more';
 
            td.appendChild(lnk);
 

	
 
            show_more.appendChild(td);
 
            show_more.appendChild(document.createElement('td'));
 
            tbl.appendChild(show_more);
 
        }
 

	
 
    }
 
    if (data.length == 0) {
 
        tbl.innerHTML = "<tr><td>${_('No data ready yet')}</td></tr>";
 
    }
 

	
 
    $('#lang_stats').appendChild(tbl);
 
    $('#lang_stats').append(tbl);
 
    $('#code_status_show_more').click(function(){
 
        $('.stats_hidden').show();
 
        $('#code_status_show_more').hide();
 
    });
 
});
 
</script>
 
%endif
 

	
 
</%def>
0 comments (0 inline, 0 general)