From 3e59cb3cbbab3d93b4789c9ffe05d4adc2c7a422 Mon Sep 17 00:00:00 2001
From: Andrei Yusupau <andrei.yusupau@gmail.com>
Date: Tue, 19 Dec 2023 00:46:34 +0100
Subject: [PATCH 1/3] Fix Copying feedback session: mark session name as
 mandatory field when copying feedback session #12652

---
 .../copy-session-modal.component.spec.ts.snap | 32 ++++++++++++++++---
 .../copy-session-modal.component.html         | 11 +++++--
 .../copy-session-modal.component.scss         |  4 +++
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap b/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
index 3984fd54696..c78bb805b60 100644
--- a/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
+++ b/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
@@ -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"
             type="text"
+            required=""
           />
+          <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>
@@ -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"
             type="text"
+            required=""
           />
+          <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>
@@ -201,4 +223,4 @@ exports[`CopySessionModalComponent should snap with some session and courses can
     </button>
   </div>
 </tm-copy-session-modal>
-`;
\ No newline at end of file
+`;
diff --git a/src/web/app/components/copy-session-modal/copy-session-modal.component.html b/src/web/app/components/copy-session-modal/copy-session-modal.component.html
index 8403422d14a..f037cee2a19 100644
--- a/src/web/app/components/copy-session-modal/copy-session-modal.component.html
+++ b/src/web/app/components/copy-session-modal/copy-session-modal.component.html
@@ -9,9 +9,14 @@ <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">
-        <span>{{ FEEDBACK_SESSION_NAME_MAX_LENGTH - newFeedbackSessionName.length }} characters left</span>
+        <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.
+          </div>
+          <span>{{ FEEDBACK_SESSION_NAME_MAX_LENGTH - newFeedbackSessionName.length }} characters left</span>
       </div>
       <div class="form-check" *ngFor="let course of courseCandidates">
         <label class="form-check-label text-break">
diff --git a/src/web/app/components/copy-session-modal/copy-session-modal.component.scss b/src/web/app/components/copy-session-modal/copy-session-modal.component.scss
index e69de29bb2d..b2a5ec189aa 100644
--- a/src/web/app/components/copy-session-modal/copy-session-modal.component.scss
+++ b/src/web/app/components/copy-session-modal/copy-session-modal.component.scss
@@ -0,0 +1,4 @@
+.invalid-field {
+  padding-top: 5px;
+  color: #B50000;
+}

From 853146d12462defd6236972135259e01a1d18419 Mon Sep 17 00:00:00 2001
From: Andrei Yusupau <andrei.yusupau@gmail.com>
Date: Tue, 19 Dec 2023 23:09:13 +0100
Subject: [PATCH 2/3] Fix Copying feedback session: mark session name as
 mandatory field when copying feedback session #12652

---
 .../copy-session-modal.component.spec.ts.snap          |  8 ++++----
 .../copy-session-modal.component.html                  | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap b/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
index c78bb805b60..2226465585a 100644
--- a/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
+++ b/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
@@ -51,8 +51,8 @@ exports[`CopySessionModalComponent should snap with default fields 1`] = `
             class="form-control ng-untouched ng-pristine ng-invalid"
             id="copy-session-name"
             maxlength="64"
-            type="text"
             required=""
+            type="text"
           />
           <div
             class="invalid-field"
@@ -62,7 +62,7 @@ exports[`CopySessionModalComponent should snap with default fields 1`] = `
               aria-hidden="true"
               class="fa fa-exclamation-circle"
             />
-             The field Name for copied session should not be empty.
+             The field Name for copied session should not be empty. 
           </div>
           <span>
             64 characters left
@@ -142,8 +142,8 @@ exports[`CopySessionModalComponent should snap with some session and courses can
             class="form-control ng-untouched ng-pristine ng-invalid"
             id="copy-session-name"
             maxlength="64"
-            type="text"
             required=""
+            type="text"
           />
           <div
             class="invalid-field"
@@ -153,7 +153,7 @@ exports[`CopySessionModalComponent should snap with some session and courses can
               aria-hidden="true"
               class="fa fa-exclamation-circle"
             />
-             The field Name for copied session should not be empty.
+             The field Name for copied session should not be empty. 
           </div>
           <span>
             52 characters left
diff --git a/src/web/app/components/copy-session-modal/copy-session-modal.component.html b/src/web/app/components/copy-session-modal/copy-session-modal.component.html
index f037cee2a19..1c8a8458f7d 100644
--- a/src/web/app/components/copy-session-modal/copy-session-modal.component.html
+++ b/src/web/app/components/copy-session-modal/copy-session-modal.component.html
@@ -12,11 +12,11 @@ <h5 class="modal-title">
         <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.
-          </div>
-          <span>{{ FEEDBACK_SESSION_NAME_MAX_LENGTH - newFeedbackSessionName.length }} characters left</span>
+        <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.
+        </div>
+        <span>{{ FEEDBACK_SESSION_NAME_MAX_LENGTH - newFeedbackSessionName.length }} characters left</span>
       </div>
       <div class="form-check" *ngFor="let course of courseCandidates">
         <label class="form-check-label text-break">

From f9e45c4cd8788100f38481c16e622428d6830125 Mon Sep 17 00:00:00 2001
From: Andrei Yusupau <andrei.yusupau@gmail.com>
Date: Wed, 20 Dec 2023 17:18:39 +0100
Subject: [PATCH 3/3] Fix Copying feedback session: mark session name as
 mandatory field when copying feedback session #12652

---
 .../__snapshots__/copy-session-modal.component.spec.ts.snap   | 4 ++--
 .../copy-session-modal/copy-session-modal.component.html      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap b/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
index 2226465585a..889f95c5e13 100644
--- a/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
+++ b/src/web/app/components/copy-session-modal/__snapshots__/copy-session-modal.component.spec.ts.snap
@@ -62,7 +62,7 @@ exports[`CopySessionModalComponent should snap with default fields 1`] = `
               aria-hidden="true"
               class="fa fa-exclamation-circle"
             />
-             The field Name for copied session should not be empty. 
+             The field "Name for copied session" should not be empty. 
           </div>
           <span>
             64 characters left
@@ -153,7 +153,7 @@ exports[`CopySessionModalComponent should snap with some session and courses can
               aria-hidden="true"
               class="fa fa-exclamation-circle"
             />
-             The field Name for copied session should not be empty. 
+             The field "Name for copied session" should not be empty. 
           </div>
           <span>
             52 characters left
diff --git a/src/web/app/components/copy-session-modal/copy-session-modal.component.html b/src/web/app/components/copy-session-modal/copy-session-modal.component.html
index 1c8a8458f7d..79ac691daef 100644
--- a/src/web/app/components/copy-session-modal/copy-session-modal.component.html
+++ b/src/web/app/components/copy-session-modal/copy-session-modal.component.html
@@ -14,7 +14,7 @@ <h5 class="modal-title">
                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.
+            The field "Name for copied session" should not be empty.
         </div>
         <span>{{ FEEDBACK_SESSION_NAME_MAX_LENGTH - newFeedbackSessionName.length }} characters left</span>
       </div>