Skip to content

Commit

Permalink
Merge pull request oppia#3426 from oppia/remove-unresolved-answers-fr…
Browse files Browse the repository at this point in the history 
…om-dashboard

Remove unresolved answers from the creator dashboard
  • Loading branch information
@BenHenning
BenHenning authored May 15, 2017
2 parents 9c08d2e + 7e39ae8 commit 8211aa1
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 79 deletions.
63 changes: 26 additions & 37 deletions core/controllers/dashboard.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
from core.domain import exp_domain
from core.domain import exp_services
from core.domain import feedback_services
from core.domain import stats_services
from core.domain import subscription_services
from core.domain import summary_services
from core.domain import user_jobs_continuous
Expand Down Expand Up @@ -154,49 +153,40 @@ def _get_intro_card_color(category):
def _round_average_ratings(rating):
return round(rating, feconf.AVERAGE_RATINGS_DASHBOARD_PRECISION)

exploration_ids_subscribed_to = (
subscription_services.get_exploration_ids_subscribed_to(
self.user_id))

subscribed_exploration_summaries = filter(None, (
# We need to do the filtering because some activities that were
# originally subscribed to may have been deleted since.
subscribed_exploration_summaries = [
summary for summary in
exp_services.get_exploration_summaries_matching_ids(
exploration_ids_subscribed_to)))
subscribed_collection_summaries = filter(None, (
subscription_services.get_exploration_ids_subscribed_to(
self.user_id))
if summary is not None]
subscribed_collection_summaries = [
summary for summary in
collection_services.get_collection_summaries_matching_ids(
subscription_services.get_collection_ids_subscribed_to(
self.user_id))))
self.user_id))
if summary is not None]

exploration_ids_subscribed_to = [
summary.id for summary in subscribed_exploration_summaries]

exp_summary_list = summary_services.get_displayable_exp_summary_dicts(
exp_summary_dicts = summary_services.get_displayable_exp_summary_dicts(
subscribed_exploration_summaries)
collection_summary_list = []
collection_summary_dicts = []

feedback_thread_analytics = (
feedback_services.get_thread_analytics_multi(
exploration_ids_subscribed_to))

unresolved_answers_dict = (
stats_services.get_exps_unresolved_answers_for_default_rule(
exploration_ids_subscribed_to))

total_unresolved_answers = 0

for ind, exploration in enumerate(exp_summary_list):
# TODO(bhenning): Update this to use unresolved answers from
# stats_services once the training interface is enabled and it's cheaper
# to retrieve top answers from stats_services.
for ind, exploration in enumerate(exp_summary_dicts):
exploration.update(feedback_thread_analytics[ind].to_dict())
exploration.update({
'num_unresolved_answers': (
unresolved_answers_dict[exploration['id']]['frequency']
if exploration['id'] in unresolved_answers_dict else 0
),
'top_unresolved_answers': (
unresolved_answers_dict[exploration['id']]
['unresolved_answers']
[:feconf.TOP_UNRESOLVED_ANSWERS_COUNT_DASHBOARD]
)
})
total_unresolved_answers += exploration['num_unresolved_answers']

exp_summary_list = sorted(
exp_summary_list,
exp_summary_dicts = sorted(
exp_summary_dicts,
key=lambda x: (x['num_open_threads'], x['last_updated_msec']),
reverse=True)

Expand All @@ -205,7 +195,7 @@ def _round_average_ratings(rating):
for collection_summary in subscribed_collection_summaries:
# TODO(sll): Reuse _get_displayable_collection_summary_dicts()
# in summary_services, instead of replicating it like this.
collection_summary_list.append({
collection_summary_dicts.append({
'id': collection_summary.id,
'title': collection_summary.title,
'category': collection_summary.category,
Expand All @@ -230,8 +220,7 @@ def _round_average_ratings(rating):
self.user_id))
dashboard_stats.update({
'total_open_feedback': feedback_services.get_total_open_threads(
feedback_thread_analytics),
'total_unresolved_answers': total_unresolved_answers
feedback_thread_analytics)
})
if dashboard_stats and dashboard_stats.get('average_ratings'):
dashboard_stats['average_ratings'] = (
Expand Down Expand Up @@ -259,8 +248,8 @@ def _round_average_ratings(rating):
subscribers_list.append(subscriber_summary)

self.values.update({
'explorations_list': exp_summary_list,
'collections_list': collection_summary_list,
'explorations_list': exp_summary_dicts,
'collections_list': collection_summary_dicts,
'dashboard_stats': dashboard_stats,
'last_week_stats': last_week_stats,
'subscribers_list': subscribers_list
Expand Down
2 changes: 2 additions & 0 deletions core/domain/stats_services.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
(stats_models,) = models.Registry.import_models([models.NAMES.statistics])


# TODO(bhenning): Update this to work correctly & efficiently with the new
# storage model.
def get_exps_unresolved_answers_for_default_rule(exp_ids):
"""Gets unresolved answers per exploration for default rule across all
states for explorations with ids in exp_ids. The value of total count should
Expand Down
15 changes: 1 addition & 14 deletions core/templates/dev/head/domain/dashboard/DashboardBackendApiServiceSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,7 @@ describe('Dashboard backend API service', function() {
thumbnail_bg_color: '#bb8b2f',
num_views: 2,
num_open_threads: 0,
num_total_threads: 0,
num_unresolved_answers: 2,
top_unresolved_answers: [
{
state: 'Introduction',
answer: '40',
frequency: 2
},
{
state: 'Introduction',
answer: '20',
frequency: 1
}
]
num_total_threads: 0
}],
collections_list: [],
dashboard_stats: {
Expand Down
16 changes: 1 addition & 15 deletions core/templates/dev/head/pages/dashboard/Dashboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,14 @@
*/

oppia.constant('EXPLORATION_DROPDOWN_STATS', {
OPEN_FEEDBACK: 'open_feedback',
TOP_UNRESOLVED_ANSWERS: 'top_unresolved_answers'
OPEN_FEEDBACK: 'open_feedback'
});

oppia.constant('EXPLORATIONS_SORT_BY_KEYS', {
TITLE: 'title',
RATING: 'ratings',
NUM_VIEWS: 'num_views',
OPEN_FEEDBACK: 'num_open_threads',
UNRESOLVED_ANSWERS: 'num_unresolved_answers',
LAST_UPDATED: 'last_updated_msec'
});

Expand All @@ -35,7 +33,6 @@ oppia.constant('HUMAN_READABLE_EXPLORATIONS_SORT_BY_KEYS', {
RATING: 'I18N_DASHBOARD_EXPLORATIONS_SORT_BY_AVERAGE_RATING',
NUM_VIEWS: 'I18N_DASHBOARD_EXPLORATIONS_SORT_BY_TOTAL_PLAYS',
OPEN_FEEDBACK: 'I18N_DASHBOARD_EXPLORATIONS_SORT_BY_OPEN_FEEDBACK',
UNRESOLVED_ANSWERS: 'I18N_DASHBOARD_EXPLORATIONS_SORT_BY_UNRESOLVED_ANSWERS',
LAST_UPDATED: 'I18N_DASHBOARD_EXPLORATIONS_SORT_BY_LAST_UPDATED'
});

Expand Down Expand Up @@ -89,9 +86,6 @@ oppia.controller('Dashboard', [
$scope.emptyDashboardImgUrl = UrlInterpolationService.getStaticImageUrl(
'/general/empty_dashboard.svg');

$scope.unresolvedAnswersIconUrl = UrlInterpolationService.getStaticImageUrl(
'/icons/unresolved_answers.svg');

$scope.setActiveTab = function(newActiveTabName) {
$scope.activeTab = newActiveTabName;
};
Expand Down Expand Up @@ -184,14 +178,6 @@ oppia.controller('Dashboard', [
return value;
};

$scope.topUnresolvedAnswersCount = function(exploration) {
var topUnresolvedAnswersCount = 0;
exploration.top_unresolved_answers.forEach(function(answer) {
topUnresolvedAnswersCount += answer.frequency;
});
return topUnresolvedAnswersCount;
};

$rootScope.loadingMessage = 'Loading';
DashboardBackendApiService.fetchDashboardData().then(
function(response) {
Expand Down
13 changes: 0 additions & 13 deletions core/templates/dev/head/pages/dashboard/dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ <h2 class="oppia-dashboard-title">
<p ng-if="key === 'NUM_VIEWS'" translate="I18N_DASHBOARD_TABLE_HEADING_PLAYS"></p>
<p ng-if="key === 'OPEN_FEEDBACK'" translate="I18N_DASHBOARD_TABLE_HEADING_OPEN_THREADS"></p>
<p ng-if="key === 'LAST_UPDATED'" translate="I18N_DASHBOARD_TABLE_HEADING_LAST_UPDATED"></p>
<p ng-if="key === 'UNRESOLVED_ANSWERS'" translate="I18N_DASHBOARD_TABLE_HEADING_UNRESOLVED_ANSWERS"></p>
<span class="fa"
ng-if="currentSortType === value"
ng-class="isCurrentSortDescending ? 'fa-caret-up': 'fa-caret-down'">
Expand Down Expand Up @@ -208,11 +207,6 @@ <h2 class="oppia-dashboard-title">
<[exploration.num_open_threads]>
</a>
</td>
<td ng-if="exploration.status !== 'private'">
<a ng-href="<[getExplorationUrl(exploration.id)]>" class="oppia-dashboard-list-summary">
<[exploration.num_unresolved_answers]>
</a>
</td>
<td>
<a ng-href="<[getExplorationUrl(exploration.id)]>" class="oppia-dashboard-list-summary">
<[getLocaleAbbreviatedDatetimeString(exploration.last_updated_msec)]>
Expand Down Expand Up @@ -289,13 +283,6 @@ <h2 class="activity-title protractor-test-exp-summary-tile-title">
</span>
</li>

<li flex="50" style="padding-left: 8px;">
<img ng-src="<[unresolvedAnswersIconUrl]>" style="width: 15px; padding-top: 1px;" tooltip="Unresolved Answers" tooltip-placement="top" class="oppia-dashboard-card-statistic-icon" alt="Unresolved Answers">
<span class="oppia-dashboard-card-statistic-value">
<[exploration.num_unresolved_answers]>
</span>
</li>

<li flex="50">
<span class="fa fa-clock-o fa-lg oppia-dashboard-card-statistic-icon"
tooltip="<['I18N_LIBRARY_LAST_UPDATED' | translate]>"
Expand Down

0 comments on commit 8211aa1

Please sign in to comment.