MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rrs: Maintainers statistics fixed sorting of weeks

Browse Source 
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
This commit is contained in:
Aníbal Limón 2015-02-19 12:17:11 +00:00
parent 2f3281d447
commit 1cf8426d1a
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rrs/models.py
View File

@ -93,10 +93,9 @@ class Milestone(models.Model):
if current_date >= self.end_date: if current_date >= self.end_date:
break; break;
week = "Wk" + str(week_no) weeks[week_no] = {}
weeks[week] = {} weeks[week_no]['start_date'] = current_date
weeks[week]['start_date'] = current_date weeks[week_no]['end_date'] = current_date + week_delta
weeks[week]['end_date'] = current_date + week_delta
current_date += week_delta current_date += week_delta
week_no += 1 week_no += 1

7
rrs/views.py
View File

@ -415,8 +415,10 @@ class MaintainerListView(ListView):
if "All" in milestone.name: if "All" in milestone.name:
intervals = milestone.get_milestone_intervals(release) intervals = milestone.get_milestone_intervals(release)
interval_type = 'Milestone'
else: else:
intervals = milestone.get_week_intervals() intervals = milestone.get_week_intervals()
interval_type = 'Week'
self.milestone_statistics = _get_milestone_statistics(milestone) self.milestone_statistics = _get_milestone_statistics(milestone)
@ -460,6 +462,10 @@ class MaintainerListView(ListView):
commit_date__lte = end_date).count() commit_date__lte = end_date).count()
ml.interval_statistics.append('' if number == 0 else number) ml.interval_statistics.append('' if number == 0 else number)
# To add Wk prefix after get statics to avoid sorting problems
if interval_type == 'Week':
self.intervals = ['Wk' + str(i) for i in self.intervals]
return maintainer_list return maintainer_list
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
@ -481,6 +487,7 @@ class MaintainerListView(ListView):
context['maintainer_count'] = self.maintainer_count context['maintainer_count'] = self.maintainer_count
context['intervals'] = self.intervals context['intervals'] = self.intervals
context['interval_range'] = range(len(self.intervals))
context['current_interval'] = self.current_interval context['current_interval'] = self.current_interval
return context return context

11
templates/rrs/maintainers.html
View File

@ -183,14 +183,9 @@ $(document).ready(function() {
4: { sorter: false }, 4: { sorter: false },
5: { sorter: false }, 5: { sorter: false },
6: { sorter: false }, 6: { sorter: false },
7: { sorter: false }, {% for i in interval_range %}
8: { sorter: false }, {{ i|add:"7" }}: { sorter: false },
9: { sorter: false }, {% endfor %}
10: { sorter: false },
11: { sorter: false },
12: { sorter: false },
13: { sorter: false },
14: { sorter: false },
} }
}); });
{% endif %} {% endif %}