Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update fork #1

Merged
merged 2 commits into from
Sep 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions author-config.csv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Repository's Location,Branch,Author's GitHub ID,Author's Email,Author's Display Name,Author's Git Author Name,Ignore Glob List
https://github.com/reposense/testrepo-Beta.git,master,nbriannl,,Nbr,,
https://github.com/reposense/testrepo-Beta.git,master,zacharytang,zacharytang.tc@gmail.com,Zac,,src/main**
https://github.com/reposense/testrepo-Beta.git,master,April0616,,Fan,LAPTOP-7KFM2KSP\User;Fan Yuting,
https://github.com/reposense/testrepo-Beta.git,master,CindyTsai1,,Cin,YuHsuan,src/test**
https://github.com/reposense/testrepo-Beta.git,add-config-json,nbriannl,,Nbr,,
https://github.com/reposense/testrepo-Beta.git,add-config-json,zacharytang,zacharytang.tc@gmail.com,Zac,,src/main**
https://github.com/reposense/testrepo-Beta.git,add-config-json,April0616,,Fan,LAPTOP-7KFM2KSP\User;Fan Yuting,
https://github.com/reposense/testrepo-Beta.git,add-config-json,CindyTsai1,,Cin,YuHsuan,src/test**
https://github.com/reposense/testrepo-Beta.git,master,nbriannl,,"Ashwin Mukadaan Singhania, Rathod",,
https://github.com/reposense/testrepo-Beta.git,master,zacharytang,zacharytang.tc@gmail.com,Yagami Rukei Polland,,src/main**
https://github.com/reposense/testrepo-Beta.git,master,April0616,,2805Tagoe,LAPTOP-7KFM2KSP\User;Fan Yuting,
https://github.com/reposense/testrepo-Beta.git,master,CindyTsai1,,,YuHsuan,src/test**
https://github.com/reposense/testrepo-Beta.git,add-config-json,nbriannl,,A.M.S.Rathod,,
https://github.com/reposense/testrepo-Beta.git,add-config-json,zacharytang,zacharytang.tc@gmail.com,Yaga..Polland,,src/main**
https://github.com/reposense/testrepo-Beta.git,add-config-json,April0616,, ,LAPTOP-7KFM2KSP\User;Fan Yuting,
https://github.com/reposense/testrepo-Beta.git,add-config-json,CindyTsai1,,Ravind s/o Ramesh,YuHsuan,src/test**
4 changes: 2 additions & 2 deletions frontend/src/static/js/v_summary.js
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ window.vSummary = {

groupByRepos(repos) {
const sortedRepos = [];
const sortingWithinOption = this.sortingWithinOption === 'title' ? 'name' : this.sortingWithinOption;
const sortingWithinOption = this.sortingWithinOption === 'title' ? 'displayName' : this.sortingWithinOption;
const sortingOption = this.sortingOption === 'groupTitle' ? 'searchPath' : this.sortingOption;
repos.forEach((users) => {
users.sort(window.comparator((ele) => ele[sortingWithinOption]));
Expand Down Expand Up @@ -738,7 +738,7 @@ window.vSummary = {
const authorMap = {};
const filtered = [];
const sortingWithinOption = this.sortingWithinOption === 'title' ? 'searchPath' : this.sortingWithinOption;
const sortingOption = this.sortingOption === 'groupTitle' ? 'name' : this.sortingOption;
const sortingOption = this.sortingOption === 'groupTitle' ? 'displayName' : this.sortingOption;
repos.forEach((users) => {
users.forEach((user) => {
if (Object.keys(authorMap).includes(user.name)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,9 @@
"nbr": 95.055145
},
"authorDisplayNameMap": {
"zacharytang": "Zac",
"CindyTsai1": "Cin",
"April0616": "Fan",
"nbr": "Nbr"
"zacharytang": "Yagami Rukei Polland",
"CindyTsai1": "Ravind s/o Ramesh",
"April0616": "2805Tagoe",
"nbr": "Ashwin Mukadaan Singhania, Rathod"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5126,9 +5126,9 @@
"wangyiming1019": 97767.41
},
"authorDisplayNameMap": {
"charlesgoh": "Cha",
"jeffreygohkw": "Jef",
"Esilocke": "Esi",
"wangyiming1019": "Wan"
"charlesgoh": "Peter Johnson",
"jeffreygohkw": "Zhao Xiang Qing",
"Esilocke": "Emilia Houston",
"wangyiming1019": "Amit Nitin Ravindra Prakash"
}
}
16 changes: 8 additions & 8 deletions src/systemtest/resources/author-config.csv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Repository's Location,Branch,Author's GitHub ID,Author's Email,Author's Display Name,Author's Git Author Name,Ignore Glob List
https://github.com/reposense/testrepo-Beta.git,,nbr,neilbrian.nl@gmail.com,Nbr,,
https://github.com/reposense/testrepo-Beta.git,,zacharytang,,Zac,Zachary Tang,src/main**
https://github.com/reposense/testrepo-Beta.git,,April0616,,Fan,LAPTOP-7KFM2KSP\User;Fan Yuting,
https://github.com/reposense/testrepo-Beta.git,,CindyTsai1,,Cin,YuHsuan,src/test**
https://github.com/reposense/testrepo-Charlie.git,,charlesgoh,,Cha,Charles Goh,
https://github.com/reposense/testrepo-Charlie.git,,Esilocke,,Esi,,
https://github.com/reposense/testrepo-Charlie.git,,jeffreygohkw,,Jef,Jeffrey Goh,
https://github.com/reposense/testrepo-Charlie.git,,wangyiming1019,,Wan,ACER\kyle;Wang Yiming,**.adoc
https://github.com/reposense/testrepo-Beta.git,,nbr,neilbrian.nl@gmail.com,"Ashwin Mukadaan Singhania, Rathod",,
https://github.com/reposense/testrepo-Beta.git,,zacharytang,,Yagami Rukei Polland,Zachary Tang,src/main**
https://github.com/reposense/testrepo-Beta.git,,April0616,,2805Tagoe,LAPTOP-7KFM2KSP\User;Fan Yuting,
https://github.com/reposense/testrepo-Beta.git,,CindyTsai1,,Ravind s/o Ramesh,YuHsuan,src/test**
https://github.com/reposense/testrepo-Charlie.git,,charlesgoh,,Peter Johnson,Charles Goh,
https://github.com/reposense/testrepo-Charlie.git,,Esilocke,,Emilia Houston,,
https://github.com/reposense/testrepo-Charlie.git,,jeffreygohkw,,Zhao Xiang Qing,Jeffrey Goh,
https://github.com/reposense/testrepo-Charlie.git,,wangyiming1019,,Amit Nitin Ravindra Prakash,ACER\kyle;Wang Yiming,**.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@
"nbr": 50.165554
},
"authorDisplayNameMap": {
"zacharytang": "Zac",
"CindyTsai1": "Cin",
"April0616": "Fan",
"nbr": "Nbr"
"zacharytang": "Yagami Rukei Polland",
"CindyTsai1": "Ravind s/o Ramesh",
"April0616": "2805Tagoe",
"nbr": "Ashwin Mukadaan Singhania, Rathod"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4188,9 +4188,9 @@
"wangyiming1019": 55435.55
},
"authorDisplayNameMap": {
"charlesgoh": "Cha",
"jeffreygohkw": "Jef",
"Esilocke": "Esi",
"wangyiming1019": "Wan"
"charlesgoh": "Peter Johnson",
"jeffreygohkw": "Zhao Xiang Qing",
"Esilocke": "Emilia Houston",
"wangyiming1019": "Amit Nitin Ravindra Prakash"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,9 @@
"nbr": 495.91364
},
"authorDisplayNameMap": {
"zacharytang": "Zac",
"CindyTsai1": "Cin",
"April0616": "Fan",
"nbr": "Nbr"
"zacharytang": "Yagami Rukei Polland",
"CindyTsai1": "Ravind s/o Ramesh",
"April0616": "2805Tagoe",
"nbr": "Ashwin Mukadaan Singhania, Rathod"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9354,9 +9354,9 @@
"wangyiming1019": 63797.973
},
"authorDisplayNameMap": {
"charlesgoh": "Cha",
"jeffreygohkw": "Jef",
"Esilocke": "Esi",
"wangyiming1019": "Wan"
"charlesgoh": "Peter Johnson",
"jeffreygohkw": "Zhao Xiang Qing",
"Esilocke": "Emilia Houston",
"wangyiming1019": "Amit Nitin Ravindra Prakash"
}
}