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

Jump to bottom

[#12652] Copying feedback session: mark session name as mandatory field when copying feedback session #12670

Merged
merged 7 commits into from
Dec 23, 2023
+38 −7
Merged

[#12652] Copying feedback session: mark session name as mandatory field when copying feedback session #12670

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e59cb3
Fix Copying feedback session: mark session name as mandatory field wh…
andreiyusupau Dec 18, 2023
853146d
Fix Copying feedback session: mark session name as mandatory field wh…
andreiyusupau Dec 19, 2023
4859f35
Merge branch 'master' into master
andreiyusupau Dec 19, 2023
f9e45c4
Fix Copying feedback session: mark session name as mandatory field wh…
andreiyusupau Dec 20, 2023
93bba21
Merge branch 'master' into master
andreiyusupau Dec 20, 2023
77c9f2f
Merge remote-tracking branch 'origin/master'
andreiyusupau Dec 20, 2023
916ec4b
Merge branch 'master' into master
domlimm Dec 23, 2023
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
32 changes: 27 additions & 5 deletions ...app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,26 @@ exports[`CopySessionModalComponent should snap with default fields 1`] = `
>
<label>
<b>
Name for copied session
Name for copied session*
</b>
</label>
<input
class="form-control ng-untouched ng-pristine ng-valid"
class="form-control ng-untouched ng-pristine ng-invalid"
id="copy-session-name"
maxlength="64"
required=""
type="text"
/>
<div
class="invalid-field"
hidden=""
>
<i
aria-hidden="true"
class="fa fa-exclamation-circle"
/>
The field Name for copied session should not be empty.
</div>
<span>
64 characters left
</span>
Expand Down Expand Up @@ -124,15 +135,26 @@ exports[`CopySessionModalComponent should snap with some session and courses can
>
<label>
<b>
Name for copied session
Name for copied session*
</b>
</label>
<input
class="form-control ng-untouched ng-pristine ng-valid"
class="form-control ng-untouched ng-pristine ng-invalid"
id="copy-session-name"
maxlength="64"
required=""
type="text"
/>
<div
class="invalid-field"
hidden=""
>
<i
aria-hidden="true"
class="fa fa-exclamation-circle"
/>
The field Name for copied session should not be empty.
</div>
<span>
52 characters left
</span>
Expand Down Expand Up @@ -201,4 +223,4 @@ exports[`CopySessionModalComponent should snap with some session and courses can
</button>
</div>
</tm-copy-session-modal>
`;
`;
9 changes: 7 additions & 2 deletions src/web/app/components/copy-session-modal/copy-session-modal.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@ <h5 class="modal-title">
<div class="row">
<div class="col-12">
<div class="form-group">
<label><b>Name for copied session</b></label>
<input id="copy-session-name" type="text" class="form-control" [(ngModel)]="newFeedbackSessionName" [maxlength]="FEEDBACK_SESSION_NAME_MAX_LENGTH">
<label><b>Name for copied session*</b></label>
<input id="copy-session-name" type="text" class="form-control" [(ngModel)]="newFeedbackSessionName" [maxlength]="FEEDBACK_SESSION_NAME_MAX_LENGTH"
required #newSessionName="ngModel">
<div [hidden]="newSessionName.valid || (newSessionName.pristine && newSessionName.untouched)" class="invalid-field">
<i class="fa fa-exclamation-circle" aria-hidden="true"></i>
The field Name for copied session should not be empty.
andreiyusupau marked this conversation as resolved.
Show resolved Hide resolved
</div>
<span>{{ FEEDBACK_SESSION_NAME_MAX_LENGTH - newFeedbackSessionName.length }} characters left</span>
</div>
<div class="form-check" *ngFor="let course of courseCandidates">
Expand Down
4 changes: 4 additions & 0 deletions src/web/app/components/copy-session-modal/copy-session-modal.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.invalid-field {
padding-top: 5px;
color: #B50000;
}
Loading