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

merge dev to staging #352

Merged
merged 3 commits into from
Sep 12, 2023
Merged
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
100 changes: 15 additions & 85 deletions src/app/views/telemetry/config/telemetry_config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export const config = {
"hierarchyLevel": "0",
"actions": {
"queries": {
"bigNumber1":"select count(userid) as daily_user_count from datasets.telemetry_usercount_daily_users where date = current_date",
"bigNumber2":"select count(userid) as weekly_user_count from datasets.telemetry_usercount_daily_users where date between current_date - interval '7 days' and current_date "
"bigNumber1": "select count(userid) as daily_user_count from datasets.telemetry_usercount_daily_users where date = current_date",
"bigNumber2": "select count(userid) as weekly_user_count from datasets.telemetry_usercount_daily_users where date between current_date - interval '7 days' and current_date "
},
"level": "state"
}
Expand All @@ -30,8 +30,9 @@ export const config = {
"hierarchyLevel": "1",
"actions": {
"queries": {
"bigNumber1":"select count(userid) as daily_user_count from datasets.telemetry_usercount_daily_users where date = current_date",
"bigNumber2":"select count(userid) as weekly_user_count from datasets.telemetry_usercount_daily_users where date between current_date - interval '7 days' and current_date " },
"bigNumber1": "select count(userid) as daily_user_count from datasets.telemetry_usercount_daily_users where date = current_date",
"bigNumber2": "select count(userid) as weekly_user_count from datasets.telemetry_usercount_daily_users where date between current_date - interval '7 days' and current_date "
},
"level": "district"
}
},
Expand Down Expand Up @@ -71,7 +72,8 @@ export const config = {
],
"options": {
"barChart": {
"isMultibar": true,
"metricLabelProp": "User Count",
"metricValueProp": "user_count",
"valueSuffix": "",
"yAxis": {
"title": "User Count"
Expand All @@ -80,12 +82,6 @@ export const config = {
"title": "Browsers",
"label": "browsername",
"value": "browsername",
"metrics": [
{
"label": "User Count",
"value": "user_count"
},
]
}
},
}
Expand Down Expand Up @@ -117,7 +113,8 @@ export const config = {
],
"options": {
"barChart": {
"isMultibar": true,
"metricLabelProp": "User Count",
"metricValueProp": "user_count",
"valueSuffix": "",
"yAxis": {
"title": "User Conunt"
Expand All @@ -126,15 +123,10 @@ export const config = {
"title": "Device Name",
"label": "devicename",
"value": "devicename",
"metrics": [
{
"label": "User Count",
"value": "user_count"
},

]

}
},

}
},
popularLandingPagesBarChart: {
Expand All @@ -156,7 +148,8 @@ export const config = {
],
"options": {
"barChart": {
"isMultibar": true,
"metricLabelProp": "% Target Achieved-Enrolment",
"metricValueProp": "target_achieved",
"valueSuffix": "%",
"yAxis": {
"title": ""
Expand All @@ -165,40 +158,8 @@ export const config = {
"title": " Programs",
"label": "program_name",
"value": "program_name",
"metrics": [
{
"label": "% Target Achieved-Enrolment",
"value": "target_achieved"
},
{
"label": "% Total Target-Enrolment",
"value": "total_target"
}
]
}
},
"stackedBarChart": {
"isMultibar": true,
"valueSuffix": "%",
"yAxis": {
"title": "States",
"label": "state_name",
"value": "state_name",
},
"xAxis": {
"title": "",
"metrics": [
{
"label": "% Target Achieved-Enrolment",
"value": "achieved_enrollments_per"
},
{
"label": "% Total Target-Enrolment",
"value": "expected_enrollments_per"
}
]
}
}
}
},
timeSpentPerPageBarChart: {
Expand All @@ -220,7 +181,8 @@ export const config = {
],
"options": {
"barChart": {
"isMultibar": true,
"metricLabelProp": "% Target Achieved-Enrolment",
"metricValueProp": "target_achieved",
"valueSuffix": "%",
"yAxis": {
"title": ""
Expand All @@ -229,38 +191,6 @@ export const config = {
"title": " Programs",
"label": "program_name",
"value": "program_name",
"metrics": [
{
"label": "% Target Achieved-Enrolment",
"value": "target_achieved"
},
{
"label": "% Total Target-Enrolment",
"value": "total_target"
}
]
}
},
"stackedBarChart": {
"isMultibar": true,
"valueSuffix": "%",
"yAxis": {
"title": "States",
"label": "state_name",
"value": "state_name",
},
"xAxis": {
"title": "",
"metrics": [
{
"label": "% Target Achieved-Enrolment",
"value": "achieved_enrollments_per"
},
{
"label": "% Total Target-Enrolment",
"value": "expected_enrollments_per"
}
]
}
}
}
Expand Down
Loading