Skip to content
This repository has been archived by the owner on Sep 25, 2019. It is now read-only.

Sample answers for keyword auto-grading #440

Merged
merged 3 commits into from
Sep 15, 2015

Conversation

dariusf
Copy link
Contributor

@dariusf dariusf commented Sep 4, 2015

Allows teachers to input sample answers when creating general questions. These will be shown on grading, and can also be used as an alternative way to input keywords.

keywords

General questions now have a field for teachers to input a sample
answer. This field is shown together with keyword options and is input
with them as well.

Also improved presentation of empty keyword options.
@@ -895,6 +895,18 @@ $grayMediumLight: #eaeaea;
/*float: right;*/
}

.rounded-box {
position: relative;
padding: 10px 10px 10px;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shorthand form for property padding should be written more concisely as 10px instead of 10px 10px 10px

@dariusf dariusf force-pushed the dariusf/keyword-sample-answers branch from 371d7e1 to 3fe5d10 Compare September 4, 2015 17:29
position: relative;

h4 {
color: #666;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Color literals like #666 should only be used in variable declarations; they should be referred to via variable everywhere else.

@dariusf dariusf force-pushed the dariusf/keyword-sample-answers branch from 3fe5d10 to 76d091d Compare September 4, 2015 17:32
$popoverProxy.popover('hide');
$('[data-association="auto_grading_keyword_option"]').click();

var $keywordField = $('#auto-grading-keyword > :nth-last-child(2) input[id$="keyword"]');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

@dariusf dariusf force-pushed the dariusf/keyword-sample-answers branch from 76d091d to 4fd7d88 Compare September 4, 2015 17:44
@@ -895,6 +896,15 @@ $grayMediumLight: #eaeaea;
/*float: right;*/
}

.rounded-box {
border: 1px solid $sampleAnswerBorder;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Name of variable sampleAnswerBorder should be written in all lowercase letters with hyphens instead of underscores

Existing keywords are highlighted in the keyword display when switching
to it and when adding a new keyword.
@dariusf dariusf force-pushed the dariusf/keyword-sample-answers branch from 4fd7d88 to 420e57c Compare September 4, 2015 17:46
allenwq pushed a commit that referenced this pull request Sep 15, 2015
@allenwq allenwq merged commit a9abd71 into master Sep 15, 2015
@allenwq
Copy link
Member

allenwq commented Sep 15, 2015

@dariusf Thanks !

BTW, you should push changes to your own repo :)

@dariusf
Copy link
Contributor Author

dariusf commented Sep 15, 2015

Thanks, I will next time.

@dariusf dariusf deleted the dariusf/keyword-sample-answers branch September 15, 2015 10:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants