Browse Source

Revert "Merge pull request #7817 from sairina/change-all-krouterlinks"

This reverts commit 72a858ad4f, reversing
changes made to fc57aeb8f5.
pull/7822/head
Jacob Pierce 8 months ago
parent
commit
0e9f2ea46d
  1. 2
      kolibri/core/package.json
  2. 11
      kolibri/plugins/coach/assets/src/views/AllFacilitiesPage.vue
  3. 11
      kolibri/plugins/coach/assets/src/views/CoachClassListPage.vue
  4. 13
      kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
  5. 11
      kolibri/plugins/coach/assets/src/views/plan/GroupsPage/GroupRow.vue
  6. 11
      kolibri/plugins/coach/assets/src/views/plan/LessonsRootPage/index.vue
  7. 21
      kolibri/plugins/coach/assets/src/views/reports/ReportsExerciseLearners.vue
  8. 11
      kolibri/plugins/coach/assets/src/views/reports/ReportsGroupLearnerListPage.vue
  9. 11
      kolibri/plugins/coach/assets/src/views/reports/ReportsGroupListPage.vue
  10. 11
      kolibri/plugins/coach/assets/src/views/reports/ReportsGroupReportLessonExerciseQuestionListPage.vue
  11. 36
      kolibri/plugins/coach/assets/src/views/reports/ReportsGroupReportLessonPage.vue
  12. 22
      kolibri/plugins/coach/assets/src/views/reports/ReportsGroupReportPage.vue
  13. 19
      kolibri/plugins/coach/assets/src/views/reports/ReportsGroupReportQuizLearnerListPage.vue
  14. 11
      kolibri/plugins/coach/assets/src/views/reports/ReportsGroupReportQuizQuestionListPage.vue
  15. 11
      kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerListPage.vue
  16. 26
      kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerReportPage.vue
  17. 11
      kolibri/plugins/coach/assets/src/views/reports/ReportsLessonLearnerListPage.vue
  18. 11
      kolibri/plugins/coach/assets/src/views/reports/ReportsLessonListPage.vue
  19. 11
      kolibri/plugins/coach/assets/src/views/reports/ReportsQuizListPage.vue
  20. 11
      kolibri/plugins/coach/assets/src/views/reports/ReportsQuizQuestionListPage.vue
  21. 16
      kolibri/plugins/coach/assets/test/views/reports/__snapshots__/ReportsExerciseLearners.spec.js.snap
  22. 11
      kolibri/plugins/facility/assets/src/views/AllFacilitiesPage.vue
  23. 11
      kolibri/plugins/facility/assets/src/views/ManageClassPage/index.vue
  24. 4
      packages/kolibri-core-for-export/package.json
  25. 11
      packages/kolibri-tools/test/fixtures/TestComponent.vue
  26. 36
      yarn.lock

2
kolibri/core/package.json

@ -16,7 +16,7 @@
"hammerjs": "^2.0.8",
"intl": "^1.2.4",
"knuth-shuffle-seeded": "^1.0.6",
"kolibri-design-system": "github:learningequality/kolibri-design-system#v0.2.x",
"kolibri-design-system": "github:learningequality/kolibri-design-system#v0.2.1",
"lockr": "0.8.4",
"lodash": "^4.17.4",
"loglevel": "^1.4.1",

11
kolibri/plugins/coach/assets/src/views/AllFacilitiesPage.vue

@ -19,11 +19,12 @@
<tbody>
<tr v-for="facility in facilities" :key="facility.id">
<td>
<KRouterLink
:text="facility.name"
:to="coachClassListPageLink(facility)"
icon="facility"
/>
<KLabeledIcon icon="facility">
<KRouterLink
:text="facility.name"
:to="coachClassListPageLink(facility)"
/>
</KLabeledIcon>
</td>
<td>
{{ $formatNumber(facility.num_classrooms) }}

11
kolibri/plugins/coach/assets/src/views/CoachClassListPage.vue

@ -46,11 +46,12 @@
<transition-group tag="tbody" name="list">
<tr v-for="classObj in classList" :key="classObj.id">
<td>
<KRouterLink
:text="classObj.name"
:to="$router.getRoute('HomePage', { classId: classObj.id })"
icon="classes"
/>
<KLabeledIcon icon="classes">
<KRouterLink
:text="classObj.name"
:to="$router.getRoute('HomePage', { classId: classObj.id })"
/>
</KLabeledIcon>
</td>
<td>
<TruncatedItemList :items="classObj.coaches.map(c => c.full_name)" />

13
kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue

@ -48,12 +48,13 @@
:key="exam.id"
>
<td>
<KRouterLink
:to="$router.getRoute('QuizSummaryPage', { quizId: exam.id })"
appearance="basic-link"
:text="exam.title"
icon="quiz"
/>
<KLabeledIcon icon="quiz">
<KRouterLink
:to="$router.getRoute('QuizSummaryPage', { quizId: exam.id })"
appearance="basic-link"
:text="exam.title"
/>
</KLabeledIcon>
</td>
<td>

11
kolibri/plugins/coach/assets/src/views/plan/GroupsPage/GroupRow.vue

@ -2,11 +2,12 @@
<tr>
<td>
<KRouterLink
:text="group.name"
:to="$router.getRoute('GroupMembersPage', { groupId: group.id })"
icon="group"
/>
<KLabeledIcon icon="group">
<KRouterLink
:text="group.name"
:to="$router.getRoute('GroupMembersPage', { groupId: group.id })"
/>
</KLabeledIcon>
</td>
<td>
{{ group.users.length }}

11
kolibri/plugins/coach/assets/src/views/plan/LessonsRootPage/index.vue

@ -49,11 +49,12 @@
:key="lesson.id"
>
<td>
<KRouterLink
:to="lessonSummaryLink({ lessonId: lesson.id, classId })"
:text="lesson.title"
icon="lesson"
/>
<KLabeledIcon icon="lesson">
<KRouterLink
:to="lessonSummaryLink({ lessonId: lesson.id, classId })"
:text="lesson.title"
/>
</KLabeledIcon>
</td>
<td>{{ coachString('numberOfResources', { value: lesson.resources.length }) }}</td>
<td>

21
kolibri/plugins/coach/assets/src/views/reports/ReportsExerciseLearners.vue

@ -14,16 +14,17 @@
<transition-group tag="tbody" name="list">
<tr v-for="entry in entries" :key="entry.id" data-test="entry">
<td>
<KRouterLink
v-if="showLink(entry)"
:text="entry.name"
:to="entry.exerciseLearnerLink"
data-test="exercise-learner-link"
icon="person"
/>
<template v-else>
{{ entry.name }}
</template>
<KLabeledIcon icon="person">
<KRouterLink
v-if="showLink(entry)"
:text="entry.name"
:to="entry.exerciseLearnerLink"
data-test="exercise-learner-link"
/>
<template v-else>
{{ entry.name }}
</template>
</KLabeledIcon>
</td>
<td>
<StatusSimple :status="entry.statusObj.status" />

11
kolibri/plugins/coach/assets/src/views/reports/ReportsGroupLearnerListPage.vue

@ -26,11 +26,12 @@
<transition-group tag="tbody" name="list">
<tr v-for="tableRow in table" :key="tableRow.id">
<td>
<KRouterLink
:text="tableRow.name"
:to="classRoute('ReportsLearnerReportPage', { learnerId: tableRow.id })"
icon="person"
/>
<KLabeledIcon icon="person">
<KRouterLink
:text="tableRow.name"
:to="classRoute('ReportsLearnerReportPage', { learnerId: tableRow.id })"
/>
</KLabeledIcon>
</td>
<td><Score :value="tableRow.avgScore" /></td>
<td>{{ coachString('integer', { value: tableRow.exercises }) }}</td>

11
kolibri/plugins/coach/assets/src/views/reports/ReportsGroupListPage.vue

@ -27,11 +27,12 @@
<transition-group tag="tbody" name="list">
<tr v-for="tableRow in table" :key="tableRow.id">
<td>
<KRouterLink
:text="tableRow.name"
:to="classRoute('ReportsGroupReportPage', { groupId: tableRow.id })"
icon="group"
/>
<KLabeledIcon icon="group">
<KRouterLink
:text="tableRow.name"
:to="classRoute('ReportsGroupReportPage', { groupId: tableRow.id })"
/>
</KLabeledIcon>
</td>
<td>
{{ coachString('integer', { value: tableRow.numLessons }) }}

11
kolibri/plugins/coach/assets/src/views/reports/ReportsGroupReportLessonExerciseQuestionListPage.vue

@ -28,11 +28,12 @@
<transition-group tag="tbody" name="list">
<tr v-for="tableRow in table" :key="tableRow.question_id">
<td>
<KRouterLink
:text="tableRow.title"
:to="questionLink(tableRow.question_id)"
icon="person"
/>
<KLabeledIcon icon="person">
<KRouterLink
:text="tableRow.title"
:to="questionLink(tableRow.question_id)"
/>
</KLabeledIcon>
</td>
<td>
<LearnerProgressRatio

36
kolibri/plugins/coach/assets/src/views/reports/ReportsGroupReportLessonPage.vue

@ -54,24 +54,24 @@
<transition-group tag="tbody" name="list">
<tr v-for="tableRow in table" :key="tableRow.node_id">
<td>
<KRouterLink
v-if="tableRow.kind === 'exercise'"
:text="tableRow.title"
:to="classRoute(
'ReportsGroupReportLessonExerciseLearnerListPage',
{ exerciseId: tableRow.content_id }
)"
:icon="tableRow.kind"
/>
<KRouterLink
v-else
:text="tableRow.title"
:to="classRoute(
'ReportsGroupReportLessonResourceLearnerListPage',
{ resourceId: tableRow.content_id }
)"
:icon="tableRow.kind"
/>
<KLabeledIcon :icon="tableRow.kind">
<KRouterLink
v-if="tableRow.kind === 'exercise'"
:text="tableRow.title"
:to="classRoute(
'ReportsGroupReportLessonExerciseLearnerListPage',
{ exerciseId: tableRow.content_id }
)"
/>
<KRouterLink
v-else
:text="tableRow.title"
:to="classRoute(
'ReportsGroupReportLessonResourceLearnerListPage',
{ resourceId: tableRow.content_id }
)"
/>
</KLabeledIcon>
</td>
<td>
<StatusSummary

22
kolibri/plugins/coach/assets/src/views/reports/ReportsGroupReportPage.vue

@ -20,11 +20,12 @@
<h2>{{ coachString('lessonsAssignedLabel') }}</h2>
<ul class="list">
<li v-for="lesson in lessonsList" :key="lesson.id">
<KRouterLink
:to="classRoute('ReportsGroupReportLessonPage', { lessonId: lesson.id })"
:text="lesson.title"
icon="lesson"
/>
<KLabeledIcon icon="lesson">
<KRouterLink
:to="classRoute('ReportsGroupReportLessonPage', { lessonId: lesson.id })"
:text="lesson.title"
/>
</KLabeledIcon>
</li>
</ul>
<p v-if="lessonsList.length === 0">
@ -35,11 +36,12 @@
<h2>{{ coachString('quizzesAssignedLabel') }}</h2>
<ul class="list">
<li v-for="exam in examsList" :key="exam.id">
<KRouterLink
:to="classRoute('ReportsGroupReportQuizLearnerListPage', { quizId: exam.id })"
:text="exam.title"
icon="quiz"
/>
<KLabeledIcon icon="quiz">
<KRouterLink
:to="classRoute('ReportsGroupReportQuizLearnerListPage', { quizId: exam.id })"
:text="exam.title"
/>
</KLabeledIcon>
</li>
</ul>
<p v-if="examsList.length === 0">

19
kolibri/plugins/coach/assets/src/views/reports/ReportsGroupReportQuizLearnerListPage.vue

@ -27,15 +27,16 @@
<transition-group tag="tbody" name="list">
<tr v-for="tableRow in table" :key="tableRow.id">
<td>
<KRouterLink
v-if="tableRow.statusObj.status !== STATUSES.notStarted"
:text="tableRow.name"
:to="detailLink(tableRow.id)"
icon="person"
/>
<template v-else>
{{ tableRow.name }}
</template>
<KLabeledIcon icon="person">
<KRouterLink
v-if="tableRow.statusObj.status !== STATUSES.notStarted"
:text="tableRow.name"
:to="detailLink(tableRow.id)"
/>
<template v-else>
{{ tableRow.name }}
</template>
</KLabeledIcon>
</td>
<td>
<StatusSimple :status="tableRow.statusObj.status" />

11
kolibri/plugins/coach/assets/src/views/reports/ReportsGroupReportQuizQuestionListPage.vue

@ -30,11 +30,12 @@
<transition-group tag="tbody" name="list">
<tr v-for="tableRow in table" :key="tableRow.question_id">
<td>
<KRouterLink
:text="tableRow.title"
:to="questionLink(tableRow.question_id)"
icon="question"
/>
<KLabeledIcon icon="question">
<KRouterLink
:text="tableRow.title"
:to="questionLink(tableRow.question_id)"
/>
</KLabeledIcon>
</td>
<td>
<LearnerProgressRatio

11
kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerListPage.vue

@ -27,11 +27,12 @@
<transition-group tag="tbody" name="list">
<tr v-for="tableRow in table" :key="tableRow.id">
<td>
<KRouterLink
:text="tableRow.name"
:to="classRoute('ReportsLearnerReportPage', { learnerId: tableRow.id })"
icon="person"
/>
<KLabeledIcon icon="person">
<KRouterLink
:text="tableRow.name"
:to="classRoute('ReportsLearnerReportPage', { learnerId: tableRow.id })"
/>
</KLabeledIcon>
</td>
<td><TruncatedItemList :items="tableRow.groups" /></td>
<td><Score :value="tableRow.avgScore" /></td>

26
kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerReportPage.vue

@ -29,13 +29,14 @@
<transition-group tag="tbody" name="list">
<tr v-for="tableRow in lessonsTable" :key="tableRow.id">
<td>
<KRouterLink
:to="classRoute('ReportsLearnerReportLessonPage', {
lessonId: tableRow.id
})"
:text="tableRow.title"
icon="lesson"
/>
<KLabeledIcon icon="lesson">
<KRouterLink
:to="classRoute('ReportsLearnerReportLessonPage', {
lessonId: tableRow.id
})"
:text="tableRow.title"
/>
</KLabeledIcon>
</td>
<td>
<StatusSimple :status="tableRow.status" />
@ -57,11 +58,12 @@
<transition-group tag="tbody" name="list">
<tr v-for="tableRow in examsTable" :key="tableRow.id">
<td>
<KRouterLink
:to="quizLink(tableRow.id)"
:text="tableRow.title"
icon="quiz"
/>
<KLabeledIcon icon="quiz">
<KRouterLink
:to="quizLink(tableRow.id)"
:text="tableRow.title"
/>
</KLabeledIcon>
</td>
<td>
<StatusSimple :status="tableRow.statusObj.status" />

11
kolibri/plugins/coach/assets/src/views/reports/ReportsLessonLearnerListPage.vue

@ -62,11 +62,12 @@
<transition-group tag="tbody" name="list">
<tr v-for="tableRow in table" :key="tableRow.id">
<td>
<KRouterLink
:text="tableRow.name"
:to="classRoute('ReportsLessonLearnerPage', { learnerId: tableRow.id })"
icon="person"
/>
<KLabeledIcon icon="person">
<KRouterLink
:text="tableRow.name"
:to="classRoute('ReportsLessonLearnerPage', { learnerId: tableRow.id })"
/>
</KLabeledIcon>
</td>
<td>
<StatusSimple :status="tableRow.status" />

11
kolibri/plugins/coach/assets/src/views/reports/ReportsLessonListPage.vue

@ -35,11 +35,12 @@
<transition-group tag="tbody" name="list">
<tr v-for="tableRow in table" :key="tableRow.id">
<td>
<KRouterLink
:text="tableRow.title"
:to="classRoute('ReportsLessonReportPage', { lessonId: tableRow.id })"
icon="lesson"
/>
<KLabeledIcon icon="lesson">
<KRouterLink
:text="tableRow.title"
:to="classRoute('ReportsLessonReportPage', { lessonId: tableRow.id })"
/>
</KLabeledIcon>
</td>
<td>
<StatusSummary

11
kolibri/plugins/coach/assets/src/views/reports/ReportsQuizListPage.vue

@ -40,11 +40,12 @@
<transition-group tag="tbody" name="list">
<tr v-for="tableRow in table" :key="tableRow.id">
<td>
<KRouterLink
:text="tableRow.title"
:to="classRoute('ReportsQuizLearnerListPage', { quizId: tableRow.id })"
icon="quiz"
/>
<KLabeledIcon icon="quiz">
<KRouterLink
:text="tableRow.title"
:to="classRoute('ReportsQuizLearnerListPage', { quizId: tableRow.id })"
/>
</KLabeledIcon>
</td>
<td>
<Score :value="tableRow.avgScore" />

11
kolibri/plugins/coach/assets/src/views/reports/ReportsQuizQuestionListPage.vue

@ -15,11 +15,12 @@
<tr v-for="(tableRow, index) in table" :key="tableRow.question_id + index">
<td>
<span v-if="$isPrint">{{ tableRow.title }}</span>
<KRouterLink
:text="tableRow.title"
:to="questionLink(tableRow.question_id)"
icon="question"
/>
<KLabeledIcon v-else icon="question">
<KRouterLink
:text="tableRow.title"
:to="questionLink(tableRow.question_id)"
/>
</KLabeledIcon>
</td>
<td>
<LearnerProgressRatio

16
kolibri/plugins/coach/assets/test/views/reports/__snapshots__/ReportsExerciseLearners.spec.js.snap

@ -14,8 +14,8 @@ exports[`ReportsExerciseLearners doesn't render groups information when show gro
</thead>
<transition-group-stub tag="tbody" name="list">
<tr data-test="entry">
<td><a dir="auto" class="KRouterLink-noKey-0_qhgpwa link" data-test="exercise-learner-link"><span class="labeled-icon-wrapper"><span class="icon"><svg viewBox="0 0 24 24" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class="" style="fill: #996189; top: 2px;"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path></svg></span> <span class="label" style="margin-left: 1.975em; max-width: calc(100% - 1.975em);"><span dir="auto" class="debug-warning"> <span class="link-text">learner1</span>
<!----></span></span> <span class="icon-after"><!----></span></span></a></td>
<td><span class="labeled-icon-wrapper"><span class="icon"><svg viewBox="0 0 24 24" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class="" style="fill: #212121; top: 2px;"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path></svg></span> <span class="label" style="margin-left: 1.975em; max-width: calc(100% - 1.975em);"><span dir="auto" class="debug-warning"><a dir="auto" class="KRouterLink-noKey-0_qhgpwa link" data-test="exercise-learner-link"><span class="labeled-icon-wrapper"><span class="icon"><!----></span> <span class="label" style="max-width: 100%;"><span dir="auto" class="debug-warning"><!----> <span class="link-text">learner1</span>
<!----></span></span> <span class="icon-after"><!----></span></span></a></span></span> <span class="icon-after"><!----></span></span></td>
<td>
<div><span class="labeled-icon-wrapper" nowrap="nowrap"><span class="icon"><svg viewBox="0 0 24 24" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class="" style="fill: #ffc107;"><path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm4.24 16L12 15.45 7.77 18l1.12-4.81-3.73-3.23 4.92-.42L12 5l1.92 4.53 4.92.42-3.73 3.23L16.23 18z"></path></svg></span> <span class="label" style="margin-left: 1.975em; max-width: calc(100% - 1.975em);"><span dir="auto" class="debug-warning">
Completed
@ -30,8 +30,8 @@ exports[`ReportsExerciseLearners doesn't render groups information when show gro
</span></td>
</tr>
<tr data-test="entry">
<td><a dir="auto" class="KRouterLink-noKey-0_qhgpwa link" data-test="exercise-learner-link"><span class="labeled-icon-wrapper"><span class="icon"><svg viewBox="0 0 24 24" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class="" style="fill: #996189; top: 2px;"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path></svg></span> <span class="label" style="margin-left: 1.975em; max-width: calc(100% - 1.975em);"><span dir="auto" class="debug-warning"> <span class="link-text">learner2</span>
<!----></span></span> <span class="icon-after"><!----></span></span></a></td>
<td><span class="labeled-icon-wrapper"><span class="icon"><svg viewBox="0 0 24 24" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class="" style="fill: #212121; top: 2px;"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path></svg></span> <span class="label" style="margin-left: 1.975em; max-width: calc(100% - 1.975em);"><span dir="auto" class="debug-warning"><a dir="auto" class="KRouterLink-noKey-0_qhgpwa link" data-test="exercise-learner-link"><span class="labeled-icon-wrapper"><span class="icon"><!----></span> <span class="label" style="max-width: 100%;"><span dir="auto" class="debug-warning"><!----> <span class="link-text">learner2</span>
<!----></span></span> <span class="icon-after"><!----></span></span></a></span></span> <span class="icon-after"><!----></span></span></td>
<td>
<div><span class="labeled-icon-wrapper" nowrap="nowrap"><span class="icon"><svg viewBox="0 0 24 24" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class="" style="fill: #03a9f4;"><path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"></path><path d="M12.5 7H11v6l5.25 3.15.75-1.23-4.5-2.67z"></path></svg></span> <span class="label" style="margin-left: 1.975em; max-width: calc(100% - 1.975em);"><span dir="auto" class="debug-warning">
Started
@ -66,8 +66,8 @@ exports[`ReportsExerciseLearners renders all entries 1`] = `
</thead>
<transition-group-stub tag="tbody" name="list">
<tr data-test="entry">
<td><a dir="auto" class="KRouterLink-noKey-0_qhgpwa link" data-test="exercise-learner-link"><span class="labeled-icon-wrapper"><span class="icon"><svg viewBox="0 0 24 24" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class="" style="fill: #996189; top: 2px;"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path></svg></span> <span class="label" style="margin-left: 1.975em; max-width: calc(100% - 1.975em);"><span dir="auto" class="debug-warning"> <span class="link-text">learner1</span>
<!----></span></span> <span class="icon-after"><!----></span></span></a></td>
<td><span class="labeled-icon-wrapper"><span class="icon"><svg viewBox="0 0 24 24" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class="" style="fill: #212121; top: 2px;"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path></svg></span> <span class="label" style="margin-left: 1.975em; max-width: calc(100% - 1.975em);"><span dir="auto" class="debug-warning"><a dir="auto" class="KRouterLink-noKey-0_qhgpwa link" data-test="exercise-learner-link"><span class="labeled-icon-wrapper"><span class="icon"><!----></span> <span class="label" style="max-width: 100%;"><span dir="auto" class="debug-warning"><!----> <span class="link-text">learner1</span>
<!----></span></span> <span class="icon-after"><!----></span></span></a></span></span> <span class="icon-after"><!----></span></span></td>
<td>
<div><span class="labeled-icon-wrapper" nowrap="nowrap"><span class="icon"><svg viewBox="0 0 24 24" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class="" style="fill: #ffc107;"><path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm4.24 16L12 15.45 7.77 18l1.12-4.81-3.73-3.23 4.92-.42L12 5l1.92 4.53 4.92.42-3.73 3.23L16.23 18z"></path></svg></span> <span class="label" style="margin-left: 1.975em; max-width: calc(100% - 1.975em);"><span dir="auto" class="debug-warning">
Completed
@ -86,8 +86,8 @@ exports[`ReportsExerciseLearners renders all entries 1`] = `
</span></td>
</tr>
<tr data-test="entry">
<td><a dir="auto" class="KRouterLink-noKey-0_qhgpwa link" data-test="exercise-learner-link"><span class="labeled-icon-wrapper"><span class="icon"><svg viewBox="0 0 24 24" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class="" style="fill: #996189; top: 2px;"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path></svg></span> <span class="label" style="margin-left: 1.975em; max-width: calc(100% - 1.975em);"><span dir="auto" class="debug-warning"> <span class="link-text">learner2</span>
<!----></span></span> <span class="icon-after"><!----></span></span></a></td>
<td><span class="labeled-icon-wrapper"><span class="icon"><svg viewBox="0 0 24 24" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class="" style="fill: #212121; top: 2px;"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path></svg></span> <span class="label" style="margin-left: 1.975em; max-width: calc(100% - 1.975em);"><span dir="auto" class="debug-warning"><a dir="auto" class="KRouterLink-noKey-0_qhgpwa link" data-test="exercise-learner-link"><span class="labeled-icon-wrapper"><span class="icon"><!----></span> <span class="label" style="max-width: 100%;"><span dir="auto" class="debug-warning"><!----> <span class="link-text">learner2</span>
<!----></span></span> <span class="icon-after"><!----></span></span></a></span></span> <span class="icon-after"><!----></span></span></td>
<td>
<div><span class="labeled-icon-wrapper" nowrap="nowrap"><span class="icon"><svg viewBox="0 0 24 24" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class="" style="fill: #03a9f4;"><path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"></path><path d="M12.5 7H11v6l5.25 3.15.75-1.23-4.5-2.67z"></path></svg></span> <span class="label" style="margin-left: 1.975em; max-width: calc(100% - 1.975em);"><span dir="auto" class="debug-warning">
Started

11
kolibri/plugins/facility/assets/src/views/AllFacilitiesPage.vue

@ -11,11 +11,12 @@
<tbody>
<tr v-for="facility in facilities" :key="facility.id">
<td>
<KRouterLink
:text="facility.name"
:to="facilityLink(facility)"
icon="facility"
/>
<KLabeledIcon icon="facility">
<KRouterLink
:text="facility.name"
:to="facilityLink(facility)"
/>
</KLabeledIcon>
</td>
<td>
{{ $formatNumber(facility.num_classrooms) }}

11
kolibri/plugins/facility/assets/src/views/ManageClassPage/index.vue

@ -53,11 +53,12 @@
:key="classroom.id"
>
<td>
<KRouterLink
:text="classroom.name"
:to="classEditLink(classroom.id)"
icon="classes"
/>
<KLabeledIcon icon="classes">
<KRouterLink
:text="classroom.name"
:to="classEditLink(classroom.id)"
/>
</KLabeledIcon>
</td>
<td>
<span :ref="`coachNames${classroom.id}`">

4
packages/kolibri-core-for-export/package.json

@ -17,7 +17,7 @@
"frame-throttle": "^3.0.0",
"intl": "^1.2.4",
"knuth-shuffle-seeded": "^1.0.6",
"kolibri-design-system": "github:learningequality/kolibri-design-system#v0.2.x",
"kolibri-design-system": "github:nucleogenesis/kolibri-design-system-1#big-keen-ui-vendoring",
"lockr": "0.8.4",
"lodash": "^4.17.4",
"loglevel": "^1.4.1",
@ -36,4 +36,4 @@
"devDependencies": {
"kolibri-tools": "0.13.0-dev.10"
}
}
}

11
packages/kolibri-tools/test/fixtures/TestComponent.vue

@ -45,11 +45,12 @@
<transition-group tag="tbody" name="list">
<tr v-for="classObj in classList" :key="classObj.id">
<td>
<KRouterLink
:text="classObj.name"
:to="$router.getRoute('HomePage', { classId: classObj.id })"
icon="classes"
/>
<KLabeledIcon icon="classes">
<KRouterLink
:text="classObj.name"
:to="$router.getRoute('HomePage', { classId: classObj.id })"
/>
</KLabeledIcon>
</td>
<td>
<TruncatedItemList :items="classObj.coaches.map(c => c.full_name)" />

36
yarn.lock

@ -1012,6 +1012,11 @@
"@types/yargs" "^15.0.0"
chalk "^3.0.0"
"@mdi/svg@^5.3.45":
version "5.3.45"
resolved "https://registry.yarnpkg.com/@mdi/svg/-/svg-5.3.45.tgz#27456a94ffa16b71c0a6581b584f24ed9d4f6b2e"
integrity sha512-MHUZBDSRDG6uWcRlQs4nALliPRT8u4gg5E+knk7FuFBUb3NjFgjT0PjdnTyEN0f3mwVLzLvggs7v7G/NVO+gaw==
"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@ -8585,18 +8590,41 @@ knuth-shuffle-seeded@^1.0.6:
dependencies:
seed-random "~2.2.0"
"kolibri-design-system@github:learningequality/kolibri-design-system#v0.2.x":
version "0.2.2-beta4"
resolved "https://codeload.github.com/learningequality/kolibri-design-system/tar.gz/4a2ae39872817e189c35db1de975c9c49b5b03fa"
"kolibri-design-system@github:learningequality/kolibri-design-system#v0.2.1":
version "0.2.1"
resolved "https://codeload.github.com/learningequality/kolibri-design-system/tar.gz/d8d8e88f5d644f04dac948fc9a1ab0296afbe09a"
dependencies:
"@babel/core" "^7.9.6"
"@babel/preset-env" "^7.9.6"
"@mdi/svg" "^5.3.45"
aphrodite "https://github.com/learningequality/aphrodite/"
autosize "^3.0.21"
css-element-queries "^1.2.0"
fuzzysearch "^1.0.3"
keen-ui "^1.3.0"
lodash "^4.17.15"
material-design-icons "^3.0.1"
popper.js "^1.14.6"
purecss "^0.6.2"
svgo "^1.3.2"
tippy.js "^4.2.1"
"kolibri-design-system@github:nucleogenesis/kolibri-design-system-1#big-keen-ui-vendoring":
version "0.2.0"
resolved "https://codeload.github.com/nucleogenesis/kolibri-design-system-1/tar.gz/3548f0cb4870da41bc7e466190500d8f3d98e45b"
dependencies:
"@babel/core" "^7.9.6"
"@babel/preset-env" "^7.9.6"
aphrodite "https://github.com/learningequality/aphrodite/"
autosize "^3.0.21"
css-element-queries "^1.2.0"
fuzzysearch "^1.0.3"
keen-ui "^1.3.0"
lodash "^4.17.15"
material-design-icons "^3.0.1"
popper.js "^1.14.6"
purecss "^0.6.2"
svgo "^1.3.2"
tippy.js "^4.2.1"
last-call-webpack-plugin@^3.0.0:
@ -13543,7 +13571,7 @@ svgo@^0.7.0, svgo@^0.7.2:
sax "~1.2.1"
whet.extend "~0.9.9"
svgo@^1.0.0:
svgo@^1.0.0, svgo@^1.3.2:
version "1.3.2"
resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==

Loading…
Cancel
Save