Skip to content

Commit 6b6f05c

Browse files
committed
Merge branch 'guidelines' of https://github.com/frknbasaran/countly-server into guidelines
2 parents 21f88f3 + b57b926 commit 6b6f05c

File tree

122 files changed

+8305
-7155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+8305
-7155
lines changed

api/lib/countly.common.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1966,8 +1966,8 @@ function getUniqArray(pweeksArray, pweekCounts, pmonthsArray, pmonthCounts, pper
19661966
}
19671967

19681968
for (let i = 0; i < monthsArray.length; i++) {
1969-
if (monthsArray[i] === 0) {
1970-
if (weeksArray[i] === 0 || (rejectedWeeks.indexOf(weeksArray[i]) !== -1)) {
1969+
if (parseInt(monthsArray[i]) === 0) {
1970+
if (parseInt(weeksArray[i]) === 0 || (rejectedWeeks.indexOf(weeksArray[i]) !== -1)) {
19711971
uniquePeriods[i] = periodArr[i];
19721972
}
19731973
else {
@@ -2013,7 +2013,7 @@ function getUniqArray(pweeksArray, pweekCounts, pmonthsArray, pmonthCounts, pper
20132013

20142014
for (var i = startIndex; i < limit; i++) {
20152015
// If there isn't already a monthly bucket for that day
2016-
if (monthsArray[i] === 0) {
2016+
if (parseInt(monthsArray[i]) === 0) {
20172017
uniquePeriods[i] = periodArr[i];
20182018
}
20192019
}
@@ -2086,8 +2086,8 @@ function getUniqCheckArray(pweeksArray, pweekCounts, pmonthsArray, pmonthCounts)
20862086
}
20872087

20882088
for (let i = 0; i < monthsArray.length; i++) {
2089-
if (monthsArray[i] === 0) {
2090-
if (weeksArray[i] !== 0) {
2089+
if (parseInt(monthsArray[i]) === 0) {
2090+
if (parseInt(weeksArray[i]) !== 0) {
20912091
uniquePeriods[i] = weeksArray[i];
20922092
}
20932093
}
@@ -2160,4 +2160,4 @@ function arrayAddUniq(arr, item) {
21602160
}
21612161
}
21622162

2163-
module.exports = countlyCommon;
2163+
module.exports = countlyCommon;

api/parts/mgmt/app_users.js

+807-863
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)