From d87ca178d88fb9a2fb2256254a7b48ab3e372356 Mon Sep 17 00:00:00 2001 From: scmmishra Date: Thu, 1 Nov 2018 19:51:33 +0530 Subject: [PATCH] UI for Quiz --- .../education/doctype/program/program.json | 21 +----- .../web-academy/components/ContentArticle.vue | 10 +-- .../web-academy/components/ContentQuiz.vue | 67 ++++++++++++++++--- .../components/Quiz/QuizSingleChoice.vue | 23 +++++++ 4 files changed, 85 insertions(+), 36 deletions(-) create mode 100644 erpnext/public/js/education/web-academy/components/Quiz/QuizSingleChoice.vue diff --git a/erpnext/education/doctype/program/program.json b/erpnext/education/doctype/program/program.json index 6339d6e007..492c568748 100644 --- a/erpnext/education/doctype/program/program.json +++ b/erpnext/education/doctype/program/program.json @@ -476,7 +476,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2018-10-30 17:30:55.381657", + "modified": "2018-11-01 18:05:06.781030", "modified_by": "Administrator", "module": "Education", "name": "Program", @@ -501,25 +501,6 @@ "share": 1, "submit": 0, "write": 1 - }, - { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Guest", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 0 } ], "quick_entry": 0, diff --git a/erpnext/public/js/education/web-academy/components/ContentArticle.vue b/erpnext/public/js/education/web-academy/components/ContentArticle.vue index c50058c5eb..27d16a732e 100644 --- a/erpnext/public/js/education/web-academy/components/ContentArticle.vue +++ b/erpnext/public/js/education/web-academy/components/ContentArticle.vue @@ -4,9 +4,9 @@
-

{{ content_data.title }}

+

{{ contentData.title }}

- Published on {{ content_data.publish_date }}, by {{ content_data.author }} + Published on {{ contentData.publish_date }}, by {{ contentData.author }}
@@ -18,7 +18,7 @@
-
+
@@ -35,7 +35,7 @@ export default { name: 'ContentArticle', data() { return { - content_data: '' + contentData: '' } }, mounted() { @@ -46,7 +46,7 @@ export default { content_type: this.type } }).then(r => { - this.content_data = r.message + this.contentData = r.message }); } }; diff --git a/erpnext/public/js/education/web-academy/components/ContentQuiz.vue b/erpnext/public/js/education/web-academy/components/ContentQuiz.vue index a334799f28..adff3ccfe0 100644 --- a/erpnext/public/js/education/web-academy/components/ContentQuiz.vue +++ b/erpnext/public/js/education/web-academy/components/ContentQuiz.vue @@ -1,19 +1,64 @@ diff --git a/erpnext/public/js/education/web-academy/components/Quiz/QuizSingleChoice.vue b/erpnext/public/js/education/web-academy/components/Quiz/QuizSingleChoice.vue new file mode 100644 index 0000000000..0e28a141ed --- /dev/null +++ b/erpnext/public/js/education/web-academy/components/Quiz/QuizSingleChoice.vue @@ -0,0 +1,23 @@ + + + + +