ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Rename basic knowledge to instrument in frontend

This commit is contained in:
Ramon Wenger 2019-06-24 15:54:38 +02:00
parent dc5cbec5b8
commit bad289ac3a
12 changed files with 68 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/components/ContentBlock.vue
View File

@ -30,7 +30,7 @@
<script>
import TextBlock from '@/components/content-blocks/TextBlock';
import BasicKnowledgeWidget from '@/components/content-blocks/BasicKnowledgeWidget';
import InstrumentWidget from '@/components/content-blocks/InstrumentWidget';
import Task from '@/components/content-blocks/Task';
import ImageBlock from '@/components/content-blocks/ImageBlock';
import ImageUrlBlock from '@/components/content-blocks/ImageUrlBlock';
@ -55,7 +55,8 @@
components: {
'text_block': TextBlock,
'basic_knowledge': BasicKnowledgeWidget,
'basic_knowledge': InstrumentWidget, // for legacy
'instrument': InstrumentWidget,
'image_block': ImageBlock,
'image_url_block': ImageUrlBlock,
'video_block': VideoBlock,

8
client/src/components/BasicKnowledgeTeaser.vue → client/src/components/InstrumentTeaser.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="basic-knowledge-teaser">
<h3 class="basic-knowledge-teaser__title">Basiswissen: Diskussionsregeln</h3>
<p class="basic-knowledge-teaser__text">
<div class="instrument-teaser">
<h3 class="instrument-teaser__title">Instrument: Diskussionsregeln</h3>
<p class="instrument-teaser__text">
Für eine konstruktive Diskussion braucht es gewisse Regeln.
</p>
</div>
@ -15,7 +15,7 @@
@import "@/styles/_variables.scss";
@import "@/styles/_mixins.scss";
.basic-knowledge-teaser {
.instrument-teaser {
height: 250px;
box-sizing: border-box;
padding: $medium-spacing;

2
client/src/components/book-navigation/BookNavigation.vue
View File

@ -3,7 +3,7 @@
<book-navigation-item title="Themen">
<book-topic-navigation></book-topic-navigation>
</book-navigation-item>
<book-navigation-item title="Basiswissen">
<book-navigation-item title="Instrument">
<div>
<router-link to="/basic-knowledge">Sprache und Kommunikation</router-link>
</div>

28
client/src/components/content-blocks/BasicKnowledgeWidget.vue
View File

@ -1,28 +0,0 @@
<template>
<div class="basic-knowledge-widget">
<div class="basic-knowledge-widget__description" v-html="value.description"></div>
<router-link class="basic-knowledge-widget__button button" tag="button"
:to="{name: 'basic-knowledge', params: { slug: value.slug }}">Basiswissen lesen
</router-link>
</div>
</template>
<script>
export default {
props: ['value']
}
</script>
<style scoped lang="scss">
.basic-knowledge-widget {
margin-bottom: 30px;
&__description {
margin-bottom: 25px;
}
&__button {
}
}
</style>

28
client/src/components/content-blocks/InstrumentWidget.vue Normal file
View File

@ -0,0 +1,28 @@
<template>
<div class="instrument-widget">
<div class="instrument-widget__description" v-html="value.description"></div>
<router-link class="instrument-widget__button button" tag="button"
:to="{name: 'instrument', params: { slug: value.slug }}">Instrument lesen
</router-link>
</div>
</template>
<script>
export default {
props: ['value']
}
</script>
<style scoped lang="scss">
.instrument-widget {
margin-bottom: 30px;
&__description {
margin-bottom: 25px;
}
&__button {
}
}
</style>

11
client/src/pages/basicknowledge.vue → client/src/pages/instrument.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="basic-knowledge">
<h1 class="basic-knowledge__title">{{basicKnowledge.title}}</h1>
<div class="instrument">
<h1 class="instrument__title">{{basicKnowledge.title}}</h1>
<component v-for="component in basicKnowledge.contents"
:key="component.id"
@ -15,7 +15,7 @@
import BASIC_KNOWLEDGE_QUERY from '@/graphql/gql/basicKnowledgeQuery.gql';
import TextBlock from '@/components/content-blocks/TextBlock';
import BasicKnowledgeWidget from '@/components/content-blocks/BasicKnowledgeWidget';
import InstrumentWidget from '@/components/content-blocks/InstrumentWidget';
import ImageBlock from '@/components/content-blocks/ImageBlock';
import ImageUrlBlock from '@/components/content-blocks/ImageUrlBlock';
import VideoBlock from '@/components/content-blocks/VideoBlock';
@ -36,7 +36,8 @@
components: {
'text_block': TextBlock,
'basic_knowledge': BasicKnowledgeWidget,
'basic_knowledge': InstrumentWidget, // for legacy
'instrument': InstrumentWidget,
'image_block': ImageBlock,
'image_url_block': ImageUrlBlock,
'video_block': VideoBlock,
@ -56,7 +57,7 @@
@import "@/styles/_variables.scss";
@import "@/styles/_functions.scss";
.basic-knowledge {
.instrument {
&__title {
font-size: toRem(35px);
margin-bottom: 40px;

22
client/src/pages/basicknowledgeOverview.vue → client/src/pages/instrumentOverview.vue
View File

@ -1,24 +1,24 @@
<template>
<div class="basic-knowledge-overview">
<div class="basic-knowledge-overview__heading">
<h1 class="basic-knowledge-overview__title">
Basiswissen:<br> Sprache und Kommunikation
<div class="instrument-overview">
<div class="instrument-overview__heading">
<h1 class="instrument-overview__title">
Instrument:<br> Sprache und Kommunikation
</h1>
</div>
<div class="basic-knowledge-overview__list">
<basic-knowledge-teaser></basic-knowledge-teaser>
<basic-knowledge-teaser></basic-knowledge-teaser>
<basic-knowledge-teaser></basic-knowledge-teaser>
<div class="instrument-overview__list">
<instrument-teaser></instrument-teaser>
<instrument-teaser></instrument-teaser>
<instrument-teaser></instrument-teaser>
</div>
</div>
</template>
<script>
import BasicKnowledgeTeaser from '@/components/BasicKnowledgeTeaser';
import InstrumentTeaser from '@/components/InstrumentTeaser';
export default {
components: {
BasicKnowledgeTeaser
InstrumentTeaser
}
}
</script>
@ -26,7 +26,7 @@
<style scoped lang="scss">
@import "@/styles/_variables.scss";
.basic-knowledge-overview {
.instrument-overview {
display: grid;
grid-template-rows: auto 1fr;
justify-items: center;

12
client/src/router/index.js
View File

@ -9,8 +9,8 @@ import room from '@/pages/room'
import newRoom from '@/pages/newRoom'
import editRoom from '@/pages/editRoom'
import article from '@/pages/article'
import basicknowledge from '@/pages/basicknowledge'
import basicknowledgeOverview from '@/pages/basicknowledgeOverview'
import instrument from '@/pages/instrument'
import instrumentOverview from '@/pages/instrumentOverview'
import submissions from '@/pages/submissions'
import p404 from '@/pages/p404'
import start from '@/pages/start'
@ -55,12 +55,12 @@ const routes = [
{path: '/room/:slug', name: 'room', component: room, props: true},
{path: '/article/:slug', name: 'article', component: article, meta: {layout: 'simple'}},
{
path: '/basic-knowledge/',
name: 'basic-knowledge-overview',
component: basicknowledgeOverview,
path: '/instrument/',
name: 'instrument-overview',
component: instrumentOverview,
meta: {subnavigation: true}
},
{path: '/basic-knowledge/:slug', name: 'basic-knowledge', component: basicknowledge, meta: {layout: 'simple'}},
{path: '/instrument/:slug', name: 'instrument', component: instrument, meta: {layout: 'simple'}},
{path: '/submission/:id', name: 'submission', component: submission, meta: {layout: 'simple'}},
{path: '/portfolio', name: 'portfolio', component: portfolio},
{path: '/portfolio/:slug', name: 'project', component: project, props: true},

2
server/api/graphene_wagtail.py
View File

@ -43,7 +43,7 @@ class GenericStreamFieldType(Scalar):
d['value'] = value
except Assignment.DoesNotExist:
logger.error('Assignment {} does not exist'.format(assignment_id))
if _type == 'basic_knowledge':
if _type == 'basic_knowledge' or _type == 'instrument':
_value = d['value']
basic_knowledge = BasicKnowledge.objects.get(pk=_value['basic_knowledge'])
_value.update({

6
server/basicknowledge/wagtail_hooks.py
View File

@ -2,10 +2,10 @@ from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
from .models import BasicKnowledge
class BasicKnowledgeAdmin(ModelAdmin):
class InstrumentAdmin(ModelAdmin):
model = BasicKnowledge
menu_label = 'Basiswissen'
menu_label = 'Instrument'
list_display = ('title',)
modeladmin_register(BasicKnowledgeAdmin)
modeladmin_register(InstrumentAdmin)

4
server/books/models/contentblock.py
View File

@ -25,9 +25,9 @@ class ContentBlock(StrictHierarchyPage):
TYPE_CHOICES = (
(NORMAL, 'Normal'),
(BASE_COMMUNICATION, 'Basiswissen Sprache & Kommunikation'),
(BASE_COMMUNICATION, 'Instrument Sprache & Kommunikation'),
(TASK, 'Aufgabe'),
(BASE_SOCIETY, 'Basiswissen Gesellschaft'),
(BASE_SOCIETY, 'Instrument Gesellschaft'),
)
hidden_for = models.ManyToManyField(SchoolClass, related_name='hidden_content_blocks')

6
server/core/management/commands/dummy_data.py
View File

@ -193,7 +193,7 @@ module_1_chapter_1 = {
{
'type': 'text_block',
'value': {
'text': '<p>Ob ein Interview gelingt, hängt davon ab, wie es geführt wird. Achten Sie auf die Fragetechnik. Diese ist wichtig, wenn man herausfinden möchte, was der oder die Befragte denkt. Der oben stehende Basiswissen hilft Ihnen dabei.</p>'
'text': '<p>Ob ein Interview gelingt, hängt davon ab, wie es geführt wird. Achten Sie auf die Fragetechnik. Diese ist wichtig, wenn man herausfinden möchte, was der oder die Befragte denkt. Der oben stehende Instrument hilft Ihnen dabei.</p>'
}
},
]
@ -574,13 +574,13 @@ module_2 = {
{
'type': 'text_block',
'value': {
'text': '<p>Studieren Sie zuerst das Basiswissen zum Thema «Geldanlagen» und «Anlageformen». Nach welchen drei grundsätzlichen Gesichtspunkten kann man die Geldanlage unterscheiden?</p>'
'text': '<p>Studieren Sie zuerst das Instrument zum Thema «Geldanlagen» und «Anlageformen». Nach welchen drei grundsätzlichen Gesichtspunkten kann man die Geldanlage unterscheiden?</p>'
}
},
{
'type': 'text_block',
'value': {
'text': '<p>Beurteilen Sie die unterschiedlichen Anlageformen (Aufbewahrungsform). Füllen Sie auf Grund der Erkenntnisse aus dem Basiswissen die folgende Umfrage aus.</p>'
'text': '<p>Beurteilen Sie die unterschiedlichen Anlageformen (Aufbewahrungsform). Füllen Sie auf Grund der Erkenntnisse aus dem Instrument die folgende Umfrage aus.</p>'
}
},
{