Merge pull request #305 from shreyas1434shinde/notification

Issue #PS-2407 fix: When an admin reassigns a TL to a different block, the TL should receive a notification informing them about the change.
tekdi · Nov 10, 2024 · 08a7c4b · 08a7c4b
2 parents 87019e7 + 05310d2
commit 08a7c4b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/components/CommonUserModal.tsx b/src/components/CommonUserModal.tsx
@@ -382,10 +382,10 @@ const CommonUserModal: React.FC<UserModalProps> = ({
            if( userType === FormContextType.TEACHER){
             getNotification(userId, "FACILITATOR_PROFILE_UPDATE");
           }
-          //  if( userType === FormContextType.STUDENT){
-          //   getNotification(userId, "pending TO STUDENDT");
-          //   getNotification(userId, "pending TO TEACHER");
-          // }
+           if( userType === FormContextType.STUDENT){
+            getNotification(userId, "LEARNER_PROFILE_UPDATE_ALERT");
+            getNotification(userId, "LEARNER_PROFILE_UPDATE_BY_ADMIN_TL_FC");
+          }
 
 
           const windowUrl = window.location.pathname;

diff --git a/src/components/ReassignCenterModal.tsx b/src/components/ReassignCenterModal.tsx
@@ -236,6 +236,9 @@ const ReassignCenterModal: React.FC<ReassignCohortModalProps> = ({
           if(userType === Role.FACILITATORS){
 
           getNotification(selectedTLUserID, "FACILITATOR_BLOCK_UPDATE");
+
+          console.log(selectedTLUserID ,"FACILITATOR_BLOCK_UPDATE");
+
         }
           const blockField = userDetails?.userData?.customFields.find(
             (field: any) => field.label === "BLOCKS"
@@ -294,13 +297,11 @@ const ReassignCenterModal: React.FC<ReassignCohortModalProps> = ({
           "success"
         );
         if( userType === Role.FACILITATORS) {
-          getNotification(selectedTLUserID, "FACILITATOR_CENTER_REASSIGNMENT");
-
+          getNotification(userId, "FACILITATOR_CENTER_REASSIGNMENT");
+        }
+        if(userType === Role.LEARNERS) {
+          getNotification(selectedTLUserID, "LEARNER_REASSIGNMENT_NOTIFICATION");
         }
-        // if(userType === Role.LEARNERS) {
-        //   getNotification(selectedTLUserID, "LEARNER_CENTER_REASSIGNMENT");
-        //   // LINE NO 12 OF THIS FILE
-        // }
       } else {
         const reassignBlockObject = {
           limit: 0,