mirror/wakapi
1
0
Fork 0
mirror of https://github.com/muety/wakapi.git synced 2023-08-10 21:12:56 +03:00
Code Issues Projects Releases Wiki Activity

fix: branches chart (resolve #322)

Browse Source
This commit is contained in:
Ferdinand Mütsch 2022-02-22 08:19:51 +01:00
parent 784adec3c1
commit 302eb33b1b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/sample_data.py
View File

@ -21,6 +21,7 @@ LANGUAGES = {
'PHP': 'php', 'PHP': 'php',
'Blade': 'blade.php' 'Blade': 'blade.php'
} }
BRANCHES = ['master', 'feature-1', 'feature-2']
class Heartbeat: class Heartbeat:
@ -65,6 +66,7 @@ def generate_data(n: int, n_projects: int = 5, n_past_hours: int = 24) -> List[H
p: str = random.choice(projects) p: str = random.choice(projects)
l: str = random.choice(languages) l: str = random.choice(languages)
f: str = randomword(random.randint(2, 8)) f: str = randomword(random.randint(2, 8))
b: str = random.choice(BRANCHES)
delta: timedelta = timedelta( delta: timedelta = timedelta(
hours=random.randint(0, n_past_hours - 1), hours=random.randint(0, n_past_hours - 1),
minutes=random.randint(0, 59), minutes=random.randint(0, 59),
@ -77,6 +79,7 @@ def generate_data(n: int, n_projects: int = 5, n_past_hours: int = 24) -> List[H
entity=f'/home/me/dev/{p}/{f}.{LANGUAGES[l]}', entity=f'/home/me/dev/{p}/{f}.{LANGUAGES[l]}',
project=p, project=p,
language=l, language=l,
branch=b,
time=(now - delta).timestamp() time=(now - delta).timestamp()
)) ))

6
static/assets/js/summary.js
View File

@ -331,13 +331,13 @@ function draw(subselection) {
}) })
: null : null
let branchChart = branchesCanvas && !branchesCanvas.classList.contains('hidden') && shouldUpdate(0) let branchChart = branchesCanvas && !branchesCanvas.classList.contains('hidden') && shouldUpdate(6)
? new Chart(branchesCanvas.getContext('2d'), { ? new Chart(branchesCanvas.getContext('2d'), {
type: "bar", type: "bar",
data: { data: {
datasets: [{ datasets: [{
data: wakapiData.branches data: wakapiData.branches
.slice(0, Math.min(showTopN[0], wakapiData.branches.length)) .slice(0, Math.min(showTopN[6], wakapiData.branches.length))
.map(p => parseInt(p.total)), .map(p => parseInt(p.total)),
backgroundColor: wakapiData.branches.map((p, i) => { backgroundColor: wakapiData.branches.map((p, i) => {
const c = hexToRgb(getColor(p.key, i % baseColors.length)) const c = hexToRgb(getColor(p.key, i % baseColors.length))
@ -349,7 +349,7 @@ function draw(subselection) {
}), }),
}], }],
labels: wakapiData.branches labels: wakapiData.branches
.slice(0, Math.min(showTopN[0], wakapiData.branches.length)) .slice(0, Math.min(showTopN[6], wakapiData.branches.length))
.map(p => p.key) .map(p => p.key)
}, },
options: { options: {

2
version.txt
View File

@ -1 +1 @@
2.2.1 2.2.2