Skip to content

Feat 176 single bulk assignment refactor #247

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
dennis-zyska merged 13 commits into from
Jul 22, 2026
Merged

Feat 176 single bulk assignment refactor #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7c6e6bc
feat: use same component for both single and bulk assignment
karimouf Jun 22, 2026
c15fd1b
Merge branch 'dev' into feat-176-single_bulk-assignment-refactor
karimouf Jun 23, 2026
8162ffd
refactor: change name of component to serve single and multiple assig…
karimouf Jun 23, 2026
18fd823
refactor: create a step tempale for each step in the assignment creation
karimouf Jun 23, 2026
b0e2c10
refactor:
karimouf Jun 23, 2026
8ddc7cf
refactor: rename folder name
karimouf Jun 23, 2026
5a0b20d
Merge branch 'dev' into feat-176-single_bulk-assignment-refactor
karimouf Jul 11, 2026
c2bf54c
refactor: add bulk true for better readability
karimouf Jul 11, 2026
272800a
refactor: clean code and remove unwanted code
karimouf Jul 11, 2026
4c5d480
refactor: remove console logs
karimouf Jul 11, 2026
3dae8a5
Merge branch 'dev' into feat-176-single_bulk-assignment-refactor
karimouf Jul 22, 2026
46e383e
fix: add author names
karimouf Jul 22, 2026
af8931a
refactor: control assignment type using open function
karimouf Jul 22, 2026
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
20 changes: 8 additions & 12 deletions frontend/src/components/dashboard/Study.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@
<ConfirmModal v-if="modals.confirm" ref="confirmModal" @hide="modals.confirm = false"/>
<ManageStudiesModal v-if="modals.bulkConfirm" ref="bulkConfirmModal" @hide="modals.bulkConfirm = false"/>
<StudyCloseModal ref="studyCloseModal" />
<BulkAssignmentsModal v-if="modals.bulkAssignments" ref="bulkAssignmentsModal" @hide="modals.bulkAssignments = false"/>
<SingleAssignmentModal v-if="modals.singleAssignment" ref="singleAssignmentModal" @hide="modals.singleAssignment = false"/>
Comment thread
karimouf marked this conversation as resolved.
<AssignmentModal v-if="modals.assignment" ref="assignmentModal" @hide="modals.assignment = false"/>
<PublishAssessmentModal ref="publishAssessmentModal"/>
<InformationModal v-if="modals.information" ref="informationModal" @hide="modals.information = false"/>
<SavedTemplatesModal v-if="modals.savedTemplates" ref="savedTemplatesModal" @hide="modals.savedTemplates = false"/>
Expand All @@ -82,8 +81,7 @@ import StudyModal from "@/components/dashboard/coordinator/Study.vue";
import StudySessionModal from "@/components/dashboard/study/StudySessionModal.vue";
import BasicButton from "@/basic/Button.vue";
import ConfirmModal from "@/basic/modal/ConfirmModal.vue";
import BulkAssignmentsModal from "./study/BulkAssignmentModal.vue";
import SingleAssignmentModal from "./study/SingleAssignmentModal.vue";
import AssignmentModal from "@/components/dashboard/study/AssignmentModal.vue";
import InformationModal from "@/basic/modal/InformationModal.vue";
import ManageStudiesModal from "@/components/dashboard/study/ManageStudiesModal.vue";
import StudyCloseModal from "@/components/dashboard/study/StudyCloseModal.vue";
Expand All @@ -106,8 +104,7 @@ export default {
StudySessionModal,
BasicButton,
ConfirmModal,
BulkAssignmentsModal,
SingleAssignmentModal,
AssignmentModal,
InformationModal,
SavedTemplatesModal,
PublishAssessmentModal
Expand Down Expand Up @@ -136,8 +133,7 @@ export default {
deleteConf: false,
confirm: false,
bulkConfirm: false,
bulkAssignments: false,
singleAssignment: false,
assignment: false,
information: false,
savedTemplates: false,
},
Expand Down Expand Up @@ -472,12 +468,12 @@ export default {
this.$nextTick(() => this.$refs.bulkConfirmModal?.open());
},
openBulkAssignmentsModal() {
this.modals.bulkAssignments = true;
this.$nextTick(() => this.$refs.bulkAssignmentsModal?.open());
this.modals.assignment = true;
this.$nextTick(() => this.$refs.assignmentModal?.open(true));
},
openSingleAssignmentModal() {
this.modals.singleAssignment = true;
this.$nextTick(() => this.$refs.singleAssignmentModal?.open());
this.modals.assignment = true;
this.$nextTick(() => this.$refs.assignmentModal?.open(false));
},
openInformationModal(params) {
this.modals.information = true;
Expand Down
Loading
Loading