Skip to content

Commit ebf7228

Browse files
committed
Merge branch 'issue-1187'
2 parents 70bd574 + 784bb7d commit ebf7228

7 files changed

Lines changed: 1429 additions & 36 deletions

File tree

bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/AssignmentBuilder.tsx

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,6 @@ export const AssignmentBuilder = () => {
108108
await duplicateAssignment(assignment.id);
109109
};
110110

111-
const handleReleasedChange = async (assignment: Assignment, released: boolean) => {
112-
try {
113-
await updateAssignment({
114-
...assignment,
115-
released
116-
});
117-
toast.success(`Assignment ${released ? "released" : "not released"} for students`);
118-
} catch (error) {
119-
toast.error("Failed to update assignment release status");
120-
}
121-
};
122111

123112
const handleEnforceDueChange = async (assignment: Assignment, enforce_due: boolean) => {
124113
try {
@@ -197,7 +186,6 @@ export const AssignmentBuilder = () => {
197186
onCreateNew={handleCreateNew}
198187
onEdit={handleEdit}
199188
onDuplicate={handleDuplicate}
200-
onReleasedChange={handleReleasedChange}
201189
onEnforceDueChange={handleEnforceDueChange}
202190
onVisibilityChange={handleVisibilityChange}
203191
onRemove={onRemove}

bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/list/AssignmentList.tsx

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ interface AssignmentListProps {
2323
onCreateNew: () => void;
2424
onEdit: (assignment: Assignment) => void;
2525
onDuplicate: (assignment: Assignment) => void;
26-
onReleasedChange: (assignment: Assignment, released: boolean) => void;
2726
onEnforceDueChange: (assignment: Assignment, enforce_due: boolean) => void;
2827
onVisibilityChange: (
2928
assignment: Assignment,
@@ -39,7 +38,6 @@ export const AssignmentList = ({
3938
onCreateNew,
4039
onEdit,
4140
onDuplicate,
42-
onReleasedChange,
4341
onEnforceDueChange,
4442
onVisibilityChange,
4543
onRemove
@@ -70,19 +68,6 @@ export const AssignmentList = ({
7068
<VisibilityDropdown assignment={rowData} onChange={onVisibilityChange} />
7169
);
7270

73-
const releasedBodyTemplate = (rowData: Assignment) => (
74-
<div className="flex align-items-center justify-content-center">
75-
<InputSwitch
76-
checked={rowData.released}
77-
onChange={(e) => onReleasedChange(rowData, e.value)}
78-
tooltip={rowData.released ? "Released to students" : "Not released to students"}
79-
tooltipOptions={{
80-
position: "top"
81-
}}
82-
className={styles.smallSwitch}
83-
/>
84-
</div>
85-
);
8671

8772
const enforceDueBodyTemplate = (rowData: Assignment) => (
8873
<div className="flex align-items-center justify-content-center">
@@ -316,13 +301,6 @@ export const AssignmentList = ({
316301
body={visibilityBodyTemplate}
317302
className={styles.visibilityColumn}
318303
/>
319-
<Column
320-
style={{ width: "12px" }}
321-
field="released"
322-
header="Released"
323-
body={releasedBodyTemplate}
324-
className={styles.releasedColumn}
325-
/>
326304
<Column header="Preview" body={previewBodyTemplate} className={styles.previewColumn} />
327305
<Column body={actionsBodyTemplate} className={styles.actionsColumn} />
328306
</DataTable>

bases/rsptx/assignment_server_api/routers/student.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ def get_studyclues_book_id(course: CoursesValidator) -> str:
194194
"thinkcspy": 29,
195195
"py4e-int": 30,
196196
"PTXSB": 28,
197+
"cppds2": 35,
197198
# Add more mappings as needed
198199
}
199200
return course_to_book_id.get(course.base_course, 28)

bases/rsptx/interactives/runestone/common/js/bookfuncs.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -820,8 +820,8 @@ function shouldShowStudyCluesWidget() {
820820
return false;
821821
}
822822

823-
const enabledBasecourses = ["csawesome2", "py4e-int", "thinkcspy", "PTXSB"];
824-
const enabledCourses = ["SI201-W26-MW", "SI201-W26-TTh", "DukeCS101SP26", "mcd-csa-schoology", "mcd-csa-canvas"];
823+
const enabledBasecourses = ["csawesome2", "py4e-int", "thinkcspy", "PTXSB", "cppds2"];
824+
const enabledCourses = ["SI201-W26-MW", "SI201-W26-TTh", "DukeCS101SP26", "mcd-csa-schoology", "mcd-csa-canvas", "csawesome2-MOOC", "test_py4e-int_api", "bc_cppds_s26"];
825825
const host = window.location.hostname;
826826

827827
if (host === "localhost") {

docs/source/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Runestone Developer Documentation
2424
contributing
2525
server_feature
2626
javascript_feature
27+
question_json_schema
2728
new_language
2829
tutorial
2930
debugging

0 commit comments

Comments
 (0)