Skip to content
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

Lectures: Leave unit form selection available in edit mode #10229

Merged
merged 2 commits into from
Feb 2, 2025
Merged

Lectures: Leave unit form selection available in edit mode #10229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7c5320
Force unit form selection in edit mode to stay open
laxerhd Jan 28, 2025
5770b64
Fix mode text below selection
laxerhd Jan 28, 2025
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
158 changes: 74 additions & 84 deletions ...ure-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,92 +1,82 @@
@if (isLoading) {
<div class="d-flex justify-content-center">
<div class="spinner-border" role="status">
<span class="sr-only" jhiTranslate="loading"></span>
<div class="container">
<div class="row">
<div class="col-12 mx-auto">
<h2 jhiTranslate="artemisApp.exerciseUnit.createExerciseUnit.headline"></h2>
</div>
</div>
} @else {
<div class="container">
<div class="row">
<div class="col-12 mx-auto">
<h2 jhiTranslate="artemisApp.exerciseUnit.createExerciseUnit.headline"></h2>
</div>
<div class="row">
<div class="col-sm-6 mx-auto">
<p jhiTranslate="artemisApp.exerciseUnit.createExerciseUnit.description"></p>
</div>
<div class="row">
<div class="col-sm-6 mx-auto">
<p jhiTranslate="artemisApp.exerciseUnit.createExerciseUnit.description"></p>
</div>
<div class="col-sm-6 mx-auto text-end">
@if (hasCancelButton()) {
<button type="button" (click)="cancelForm()" class="btn btn-default">
<fa-icon [icon]="faTimes" />&nbsp;<span jhiTranslate="entity.action.cancel"></span>
</button>
}
<button
id="createButton"
type="button"
class="btn btn-primary"
[disabled]="exercisesToCreateUnitFor.length === 0"
(click)="createExerciseUnits()"
jhiTranslate="entity.action.submit"
></button>
</div>
<div class="col-sm-6 mx-auto text-end">
@if (hasCancelButton()) {
<button type="button" (click)="cancelForm()" class="btn btn-default"><fa-icon [icon]="faTimes" />&nbsp;<span jhiTranslate="entity.action.cancel"></span></button>
}
<button
id="createButton"
type="button"
class="btn btn-primary"
[disabled]="exercisesToCreateUnitFor.length === 0"
(click)="createExerciseUnits()"
jhiTranslate="entity.action.submit"
></button>
</div>
<div class="row">
<div class="col-12 mx-auto">
<div class="table-responsive">
<table class="table table-bordered">
<thead class="thead-dark">
<tr jhiSort [(predicate)]="predicate" [(ascending)]="reverse" (sortChange)="sortRows()">
<th jhiSortBy="id">
id
<fa-icon [icon]="faSort" />
</th>
<th jhiSortBy="type">
{{ 'artemisApp.exercise.type' | artemisTranslate }}
<fa-icon [icon]="faSort" />
</th>
<th jhiSortBy="title">
{{ 'artemisApp.exercise.title' | artemisTranslate }}
<fa-icon [icon]="faSort" />
</th>
<th jhiSortBy="shortName">
{{ 'artemisApp.exercise.shortName' | artemisTranslate }}
<fa-icon [icon]="faSort" />
</th>
<th jhiSortBy="releaseDate">
{{ 'artemisApp.exercise.releaseDate' | artemisTranslate }}
<fa-icon [icon]="faSort" />
</th>
<th jhiSortBy="dueDate">
{{ 'artemisApp.exercise.dueDate' | artemisTranslate }}
<fa-icon [icon]="faSort" />
</th>
<th jhiSortBy="assessmentDueDate">
{{ 'artemisApp.exercise.assessmentDueDate' | artemisTranslate }}
<fa-icon [icon]="faSort" />
</th>
</div>
<div class="row">
<div class="col-12 mx-auto">
<div class="table-responsive">
<table class="table table-bordered">
<thead class="thead-dark">
<tr jhiSort [(predicate)]="predicate" [(ascending)]="reverse" (sortChange)="sortRows()">
<th jhiSortBy="id">
id
<fa-icon [icon]="faSort" />
</th>
<th jhiSortBy="type">
{{ 'artemisApp.exercise.type' | artemisTranslate }}
<fa-icon [icon]="faSort" />
</th>
<th jhiSortBy="title">
{{ 'artemisApp.exercise.title' | artemisTranslate }}
<fa-icon [icon]="faSort" />
</th>
<th jhiSortBy="shortName">
{{ 'artemisApp.exercise.shortName' | artemisTranslate }}
<fa-icon [icon]="faSort" />
</th>
<th jhiSortBy="releaseDate">
{{ 'artemisApp.exercise.releaseDate' | artemisTranslate }}
<fa-icon [icon]="faSort" />
</th>
<th jhiSortBy="dueDate">
{{ 'artemisApp.exercise.dueDate' | artemisTranslate }}
<fa-icon [icon]="faSort" />
</th>
<th jhiSortBy="assessmentDueDate">
{{ 'artemisApp.exercise.assessmentDueDate' | artemisTranslate }}
<fa-icon [icon]="faSort" />
</th>
laxerhd marked this conversation as resolved.
Show resolved Hide resolved
</tr>
</thead>
<tbody>
@for (exercise of exercisesAvailableForUnitCreation; track exercise) {
<tr
(click)="selectExerciseForUnitCreation(exercise)"
[class.table-primary]="isExerciseSelectedForUnitCreation(exercise)"
id="exercise-{{ exercise.id }}"
>
<td>{{ exercise.id ? exercise.id : '' }}</td>
<td>{{ exercise.type ? exercise.type : '' }}</td>
<td>{{ exercise.title ? exercise.title : '' }}</td>
<td>{{ exercise.shortName ? exercise.shortName : '' }}</td>
<td>{{ exercise.releaseDate ? exercise.releaseDate.format('MMM DD YYYY, HH:mm:ss') : '' }}</td>
<td>{{ exercise.dueDate ? exercise.dueDate.format('MMM DD YYYY, HH:mm:ss') : '' }}</td>
<td>{{ exercise.assessmentDueDate ? exercise.assessmentDueDate.format('MMM DD YYYY, HH:mm:ss') : '' }}</td>
</tr>
</thead>
<tbody>
@for (exercise of exercisesAvailableForUnitCreation; track exercise) {
<tr
(click)="selectExerciseForUnitCreation(exercise)"
[class.table-primary]="isExerciseSelectedForUnitCreation(exercise)"
id="exercise-{{ exercise.id }}"
>
<td>{{ exercise.id ? exercise.id : '' }}</td>
<td>{{ exercise.type ? exercise.type : '' }}</td>
<td>{{ exercise.title ? exercise.title : '' }}</td>
<td>{{ exercise.shortName ? exercise.shortName : '' }}</td>
<td>{{ exercise.releaseDate ? exercise.releaseDate.format('MMM DD YYYY, HH:mm:ss') : '' }}</td>
<td>{{ exercise.dueDate ? exercise.dueDate.format('MMM DD YYYY, HH:mm:ss') : '' }}</td>
<td>{{ exercise.assessmentDueDate ? exercise.assessmentDueDate.format('MMM DD YYYY, HH:mm:ss') : '' }}</td>
</tr>
}
</tbody>
</table>
</div>
}
</tbody>
</table>
</div>
</div>
</div>
}
</div>
115 changes: 56 additions & 59 deletions src/main/webapp/app/lecture/lecture-units/lecture-units.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,63 +8,60 @@ <h3><span jhiTranslate="artemisApp.lecture.sections.units"></span></h3>
[showCreationCard]="false"
[showCompetencies]="false"
/>
@if (!isAnyUnitFormOpen()) {
<div class="form-group w-100 d-flex justify-content-start">
<jhi-unit-creation-card [emitEvents]="true" (onUnitCreationCardClicked)="onCreateLectureUnit($event)" />
</div>
} @else {
<div class="form-group">
@if (!isEditingLectureUnit) {
<h4><span jhiTranslate="artemisApp.lecture.newLectureUnit"></span></h4>
} @else {
<h4><span jhiTranslate="artemisApp.lecture.editLectureUnit"></span></h4>
}
@if (isTextUnitFormOpen()) {
<jhi-text-unit-form
[isEditMode]="isEditingLectureUnit"
[hasCancelButton]="true"
(onCancel)="onCloseLectureUnitForms()"
(formSubmitted)="createEditTextUnit($event)"
[formData]="textUnitFormData"
/>
}
@if (isVideoUnitFormOpen()) {
<jhi-video-unit-form
[isEditMode]="isEditingLectureUnit"
[hasCancelButton]="true"
(onCancel)="onCloseLectureUnitForms()"
(formSubmitted)="createEditVideoUnit($event)"
[formData]="videoUnitFormData"
/>
}
@if (isOnlineUnitFormOpen()) {
<jhi-online-unit-form
[isEditMode]="isEditingLectureUnit"
[hasCancelButton]="true"
(onCancel)="onCloseLectureUnitForms()"
(formSubmitted)="createEditOnlineUnit($event)"
[formData]="onlineUnitFormData"
/>
}
@if (isAttachmentUnitFormOpen()) {
<jhi-attachment-unit-form
[isEditMode]="isEditingLectureUnit"
[hasCancelButton]="true"
(onCancel)="onCloseLectureUnitForms()"
(formSubmitted)="createEditAttachmentUnit($event)"
[formData]="attachmentUnitFormData"
/>
}
@if (isExerciseUnitFormOpen()) {
<jhi-create-exercise-unit
[shouldNavigateOnSubmit]="false"
(onExerciseUnitCreated)="onExerciseUnitCreated()"
[lectureId]="lecture.id"
[courseId]="lecture.course?.id"
[hasCancelButton]="true"
(onCancel)="onCloseLectureUnitForms()"
/>
}
</div>
}
<div class="form-group w-100 d-flex justify-content-start">
<jhi-unit-creation-card [emitEvents]="true" (onUnitCreationCardClicked)="onCreateLectureUnit($event)" />
</div>
<div class="form-group">
@if (isEditingLectureUnit) {
<h4><span jhiTranslate="artemisApp.lecture.editLectureUnit"></span></h4>
} @else if (isAnyUnitFormOpen()) {
<h4><span jhiTranslate="artemisApp.lecture.newLectureUnit"></span></h4>
}
@if (isTextUnitFormOpen()) {
<jhi-text-unit-form
[isEditMode]="isEditingLectureUnit"
[hasCancelButton]="true"
(onCancel)="onCloseLectureUnitForms()"
(formSubmitted)="createEditTextUnit($event)"
[formData]="textUnitFormData"
/>
}
@if (isVideoUnitFormOpen()) {
<jhi-video-unit-form
[isEditMode]="isEditingLectureUnit"
[hasCancelButton]="true"
(onCancel)="onCloseLectureUnitForms()"
(formSubmitted)="createEditVideoUnit($event)"
[formData]="videoUnitFormData"
/>
}
@if (isOnlineUnitFormOpen()) {
<jhi-online-unit-form
[isEditMode]="isEditingLectureUnit"
[hasCancelButton]="true"
(onCancel)="onCloseLectureUnitForms()"
(formSubmitted)="createEditOnlineUnit($event)"
[formData]="onlineUnitFormData"
/>
}
@if (isAttachmentUnitFormOpen()) {
<jhi-attachment-unit-form
[isEditMode]="isEditingLectureUnit"
[hasCancelButton]="true"
(onCancel)="onCloseLectureUnitForms()"
(formSubmitted)="createEditAttachmentUnit($event)"
[formData]="attachmentUnitFormData"
/>
}
@if (isExerciseUnitFormOpen()) {
<jhi-create-exercise-unit
[shouldNavigateOnSubmit]="false"
(onExerciseUnitCreated)="onExerciseUnitCreated()"
[lectureId]="lecture.id"
[courseId]="lecture.course?.id"
[hasCancelButton]="true"
(onCancel)="onCloseLectureUnitForms()"
/>
}
</div>
</div>
2 changes: 1 addition & 1 deletion src/main/webapp/app/lecture/lecture-units/lecture-units.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class LectureUpdateUnitsComponent implements OnInit {

onCreateLectureUnit(type: LectureUnitType) {
this.isEditingLectureUnit = false;

this.onCloseLectureUnitForms();
switch (type) {
case LectureUnitType.TEXT:
this.isTextUnitFormOpen.set(true);
Expand Down
Loading