Skip to content

Print results of exercise search #3644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nathanstitt merged 18 commits into from
Jun 16, 2021
Merged

Print results of exercise search #3644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
54e25d6
convert string helpers to TS and move to shared
nathanstitt Jun 9, 2021
62c1776
add print styles to exercises
nathanstitt Jun 9, 2021
9d23d54
set title on document so it prints on PDF
nathanstitt Jun 10, 2021
6b7e48c
swap formats and solution, display solution inline
nathanstitt Jun 10, 2021
e166d95
condense margins
nathanstitt Jun 10, 2021
d447f4a
exercises styles aren't used
nathanstitt Jun 10, 2021
ef572a5
fix infinite recursion error
nathanstitt Jun 10, 2021
5f035fe
export default for modules that use it that way
nathanstitt Jun 10, 2021
9de673e
mark as action
nathanstitt Jun 10, 2021
e46f77d
update snapshots to match new detailed solution position
nathanstitt Jun 10, 2021
8c073da
fix type errors
nathanstitt Jun 10, 2021
f9558a6
revert to main
nathanstitt Jun 10, 2021
8b6e31d
restore file
nathanstitt Jun 10, 2021
80cf2f7
Added checkbox toggle for public solutions to Exercises
Dantemss Jun 7, 2021
9ca1aa6
Added solutions_are_public field to Exercise
Dantemss Jun 7, 2021
6f30308
Updated snapshots to add Public Solutions checkbox
Dantemss Jun 9, 2021
e303c68
update wording, don't nest inside full-width tag
nathanstitt Jun 15, 2021
d2e0e4d
update snapshot
nathanstitt Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions exercises/resources/styles/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ $input-height: 1.5rem;
@import "./vocabulary";
@import './tags';
@import './preview';
@import './print';

.exercises-body {
margin-top: 60px;
Expand Down
53 changes: 53 additions & 0 deletions exercises/resources/styles/print.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
@media print {
.panel.search {

.card-footer,
.pagination,
.search-filter
{
display: none;
}

.search-title {
position: fixed;
top: 0;
display: none;
}

.openstax-exercise-preview {
page-break-inside: avoid;
border: 1px solid black;

.card-body {
.answers-table {
margin-bottom: 0.5rem;
line-height: inherit;
label {
margin-bottom: 0;
}
.question-feedback-content {
line-height: 1rem;
margin: 0;
}
}
.question-stem {
margin-bottom: 0;
}
}


.openstax-question {
.detailed-solution {
margin-bottom: 0;
.solution,
.header {
margin-bottom: 0;
}

}
}
}
}

}

201 changes: 129 additions & 72 deletions exercises/specs/components/__snapshots__/exercise.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,6 +1316,28 @@ exports[`Exercises component renders and matches snapshot 1`] = `
</select>
</div>
</div>
<div
className="tag-type solutionIsPublic"
>
<div
className="heading"
>
<span
className="label"
>
Solution is public
</span>
<div
className="controls"
/>
</div>
<input
checked={false}
label=""
onChange={[Function]}
type="checkbox"
/>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -1507,28 +1529,13 @@ exports[`Exercises component renders and matches snapshot 1`] = `
</section>
</div>
</div>
<div
className="formats-listing"
>
<div
className="header"
>
Formats:
</div>
<span>
free-response
</span>
<span>
multiple-choice
</span>
</div>
<div
className="detailed-solution"
>
<div
className="header"
>
Detailed solution
Detailed solution:
</div>
<div
dangerouslySetInnerHTML={
Expand All @@ -1538,6 +1545,21 @@ exports[`Exercises component renders and matches snapshot 1`] = `
}
/>
</div>
<div
className="formats-listing"
>
<div
className="header"
>
Formats:
</div>
<span>
free-response
</span>
<span>
multiple-choice
</span>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -4263,6 +4285,28 @@ exports[`Exercises component renders with intro and a multiple questions when ex
</select>
</div>
</div>
<div
className="tag-type solutionIsPublic"
>
<div
className="heading"
>
<span
className="label"
>
Solution is public
</span>
<div
className="controls"
/>
</div>
<input
checked={false}
label=""
onChange={[Function]}
type="checkbox"
/>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -4444,28 +4488,13 @@ exports[`Exercises component renders with intro and a multiple questions when ex
</section>
</div>
</div>
<div
className="formats-listing"
>
<div
className="header"
>
Formats:
</div>
<span>
free-response
</span>
<span>
multiple-choice
</span>
</div>
<div
className="detailed-solution"
>
<div
className="header"
>
Detailed solution
Detailed solution:
</div>
<div
dangerouslySetInnerHTML={
Expand All @@ -4475,6 +4504,21 @@ exports[`Exercises component renders with intro and a multiple questions when ex
}
/>
</div>
<div
className="formats-listing"
>
<div
className="header"
>
Formats:
</div>
<span>
free-response
</span>
<span>
multiple-choice
</span>
</div>
</div>
</div>
<div>
Expand Down Expand Up @@ -4742,28 +4786,13 @@ exports[`Exercises component renders with intro and a multiple questions when ex
</section>
</div>
</div>
<div
className="formats-listing"
>
<div
className="header"
>
Formats:
</div>
<span>
free-response
</span>
<span>
multiple-choice
</span>
</div>
<div
className="detailed-solution"
>
<div
className="header"
>
Detailed solution
Detailed solution:
</div>
<div
dangerouslySetInnerHTML={
Expand All @@ -4773,6 +4802,21 @@ exports[`Exercises component renders with intro and a multiple questions when ex
}
/>
</div>
<div
className="formats-listing"
>
<div
className="header"
>
Formats:
</div>
<span>
free-response
</span>
<span>
multiple-choice
</span>
</div>
</div>
</div>
<div>
Expand Down Expand Up @@ -4900,28 +4944,13 @@ exports[`Exercises component renders with intro and a multiple questions when ex
</section>
</div>
</div>
<div
className="formats-listing"
>
<div
className="header"
>
Formats:
</div>
<span>
free-response
</span>
<span>
multiple-choice
</span>
</div>
<div
className="detailed-solution"
>
<div
className="header"
>
Detailed solution
Detailed solution:
</div>
<div
dangerouslySetInnerHTML={
Expand All @@ -4931,6 +4960,21 @@ exports[`Exercises component renders with intro and a multiple questions when ex
}
/>
</div>
<div
className="formats-listing"
>
<div
className="header"
>
Formats:
</div>
<span>
free-response
</span>
<span>
multiple-choice
</span>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -6000,6 +6044,19 @@ exports[`Exercises component resets fields when model is new 1`] = `
</TagWrapper>
</SingleDropdown>
</TimeTag>
<PublicSolutions exercise={{...}}>
<TagWrapper label=\\"Solution is public\\">
<div className=\\"tag-type solutionIsPublic\\">
<div className=\\"heading\\">
<span className=\\"label\\">
Solution is public
</span>
<div className=\\"controls\\" />
</div>
<input type=\\"checkbox\\" label=\\"\\" onChange={[Function: updateValue] { isMobxAction: true }} checked={false} />
</div>
</TagWrapper>
</PublicSolutions>
</div>
</div>
</ExerciseTags>
Expand Down Expand Up @@ -6205,6 +6262,14 @@ exports[`Exercises component resets fields when model is new 1`] = `
</Answer>
</div>
</AnswersTable>
<div className=\\"detailed-solution\\">
<div className=\\"header\\">
Detailed solution:
</div>
<Component className=\\"solution\\" block={true} html=\\"four\\">
<div dangerouslySetInnerHTML={{...}} />
</Component>
</div>
<FormatsListing formats={{...}}>
<div className=\\"formats-listing\\">
<div className=\\"header\\">
Expand All @@ -6218,14 +6283,6 @@ exports[`Exercises component resets fields when model is new 1`] = `
</span>
</div>
</FormatsListing>
<div className=\\"detailed-solution\\">
<div className=\\"header\\">
Detailed solution
</div>
<Component className=\\"solution\\" block={true} html=\\"four\\">
<div dangerouslySetInnerHTML={{...}} />
</Component>
</div>
</div>
</Question>
</div>
Expand Down
2 changes: 2 additions & 0 deletions exercises/src/components/exercise/tags.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import HistoricalThinking from '../tags/historical-thinking';
import ReasoningProcess from '../tags/reasoning-process';
import ApLo from '../tags/aplo';
import SciencePractice from '../tags/science-practice';
import PublicSolutions from '../tags/public-solutions';
import Exercise from '../../models/exercises/exercise';

function ExerciseTags({ exercise }) {
Expand All @@ -36,6 +37,7 @@ function ExerciseTags({ exercise }) {
<Dok {...tagProps} />
<Blooms {...tagProps} />
<Time {...tagProps} />
<PublicSolutions {...tagProps} />
</div>
</div>
);
Expand Down
Loading