Course specific research form #1167
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 3 commits
August 13, 2023 13:49
nygrenh
requested changes
Aug 14, 2023
| @@ -0,0 +1,28 @@ | |||
| /* eslint-disable i18next/no-literal-string */ | |||
There was a problem hiding this comment.
Rename the block (and the file) to ResearchConsentCheckbox
|
|
||
| const CheckBoxConfiguration: BlockConfiguration<CheckBoxAttributes> = { | ||
| title: "CheckBox", | ||
| description: "Checkbox block", |
There was a problem hiding this comment.
Also write here that this is only for the editor that is used for the teacher-editable research question.
services/cms/src/blocks/index.tsx
Outdated
| @@ -78,3 +80,8 @@ export const blockTypeMapForTopLevelPages = [ | |||
| ["moocfi/hero-section", HeroSection], | |||
| // eslint-disable-next-line @typescript-eslint/no-explicit-any | |||
| ] as Array<[string, BlockConfiguration<Record<string, any>>]> | |||
|
|
|||
| export const blockTypeMapForResearchConsentForm = [["moocfi/checkbox", CheckBox]] as Array< | |||
There was a problem hiding this comment.
moocfi/research-consent-checkbox
services/cms/src/blocks/index.tsx
Outdated
| @@ -53,6 +54,7 @@ export const blockTypeMapForPages = [ | |||
| ["moocfi/tablebox", TableBox], | |||
| ["moocfi/iframe", Iframe], | |||
| ["moocfi/map", Map], | |||
| ["moocfi/checkbox", CheckBox], | |||
There was a problem hiding this comment.
separate const for the research consent form editor
| ) -> ControllerResult<web::Json<ResearchForm>> { | ||
| let mut conn = pool.acquire().await?; | ||
|
|
||
| let token = authorize(&mut conn, Act::Edit, Some(user.id), Res::Exam(*course_id)).await?; |
| ) -> ControllerResult<web::Json<ResearchForm>> { | ||
| let mut conn = pool.acquire().await?; | ||
|
|
||
| let token = authorize(&mut conn, Act::View, Some(user.id), Res::Course(*course_id)).await?; |
| ) -> ControllerResult<web::Json<ResearchForm>> { | ||
| let mut conn = pool.acquire().await?; | ||
|
|
||
| let token = authorize(&mut conn, Act::View, Some(user.id), Res::Course(*course_id)).await?; |
There was a problem hiding this comment.
authorize_access_to_course_material
| ?.map((obj) => obj.course_id) | ||
| .filter((course_id: string, index, currentVal) => currentVal.indexOf(course_id) === index) | ||
| setAllCourseIds(uniqueCourseIds ?? []) | ||
| }, [getAllResearchFormAnswers.data]) |
| @@ -225,6 +225,14 @@ const ManageCourse: React.FC<React.PropsWithChildren<Props>> = ({ course, refetc | |||
| {t("link-export-course-instances")} | |||
| </a> | |||
| </li> | |||
| <li> | |||
There was a problem hiding this comment.
wrap this into a separate <OnlyRenderIfPermissions> thing
Maijjay
force-pushed
the
course-specific-research-form
branch
from
d98f3ff
to
af46e25
Compare
nygrenh
requested changes
Aug 15, 2023
| </ul> | ||
| </> | ||
| </OnlyRenderIfPermissions> | ||
| <OnlyRenderIfPermissions action={{ type: "edit" }} resource={{ type: "global_permissions" }}> | ||
| <a href={`/cms/courses/${course.id}/research-form-edit`} aria-label={"Edit research form"}> |
| <OnlyRenderIfPermissions action={{ type: "edit" }} resource={{ type: "global_permissions" }}> | ||
| <a href={`/cms/courses/${course.id}/research-form-edit`} aria-label={"Edit research form"}> | ||
| <Button variant="secondary" size="medium"> | ||
| {"Create or edit research form"} |
nygrenh
requested changes
Aug 15, 2023
...ots__/research-form.spec.ts/research-consent-form-shows-in-user-setting-page-mobile-tall.png
Outdated
Show resolved
Hide resolved
added 2 commits
August 15, 2023 12:23
nygrenh
approved these changes
Aug 16, 2023
github-actions
bot
added
dependencies
…earch-form # Conflicts: # services/headless-lms/models/sqlx-data.json
Maijjay
force-pushed
the
course-specific-research-form
branch
from
37183ab
to
b92fdf2
Compare
github-actions
bot
added
sqlx-data
and removed
dependencies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.