Merge branch 'fix_deployment_issue' of https://github.com/dicdiksha/S…

…unbirdEd-portal into fix_deployment_issue
dicdiksha · Dec 12, 2023 · 954d529 · 954d529
2 parents 54aa18e + 462d9b1
commit 954d529
Show file tree

Hide file tree

Showing 27 changed files with 33 additions and 38 deletions.
diff --git a/...src/app/modules/certificate/components/browse-image-popup/browse-image-popup.component.ts b/...src/app/modules/certificate/components/browse-image-popup/browse-image-popup.component.ts
@@ -71,40 +71,21 @@ export class BrowseImagePopupComponent implements OnInit {
   }
 
   async fileChange(ev) {
-    console.log('ev---------------->', ev);
     this.uploadForm.reset();
     const imageProperties = await this.getImageProperties(ev.target.files[0]);
-    console.log('imageProperties---------------->', imageProperties);
-
     const isDimensionMatched = this.dimentionCheck(imageProperties);
-    console.log('isDimensionMatched---------------->', isDimensionMatched);
-
     const isTypeMatched = _.get(imageProperties, 'type').includes('png');
-    console.log('isTypeMatched---------------->', isTypeMatched);
-
     const isSizeMatched = _.get(imageProperties, 'size') < 1;
-    console.log('isSizeMatched---------------->', isSizeMatched);
-
-    console.log('outside if---------------->', imageProperties && isSizeMatched && isTypeMatched && isDimensionMatched);
-
     if (imageProperties && isSizeMatched && isTypeMatched && isDimensionMatched) {
-    console.log('inside if---------------->', imageProperties && isSizeMatched && isTypeMatched && isDimensionMatched);
       this.fileObj = ev.target.files[0];
-    console.log('fileObj---------------->', this.fileObj);
-
       const fileName = _.get(this.fileObj, 'name').split('.')[0];
-    console.log('fileName---------------->', fileName);
-
       const userName = `${_.get(this.userService, 'userProfile.firstName') || ''} ${_.get(this.userService, 'userProfile.lastName') || ''}`;
-    console.log('userName---------------->', userName);
       this.uploadForm.patchValue({
         'assetCaption': fileName,
         'creator': userName,
         'creatorId': _.get(this.userService, 'userProfile.id')
       });
-      console.log('uploadForm---------------->', this.uploadForm);
     } else {
-      console.log('else---------------->', this.resourceService);
       this.toasterService.error(_.get(this.resourceService, 'frmelmnts.cert.lbl.imageErrorMsg'));
 
     }

diff --git a/...nts/course-consumption/course-consumption-header/course-consumption-header.component.html b/...nts/course-consumption/course-consumption-header/course-consumption-header.component.html
@@ -131,14 +131,14 @@ <h6 class="ui small info message" *ngIf="enrolledCourse && getBatchStatus() && b
           </div>
         </div>
 
-        <!-- <div class="certified-course__btn py-8" *ngIf="enrolledCourse && progress>0 && progress<100 && !viewDashboard">
+        <div class="certified-course__btn py-8" *ngIf="enrolledCourse && progress>0 && progress<100 && !viewDashboard">
           <button class="sb-btn sb-btn-secondary sb-btn-normal textbook__addbtn ml-8 sb-btn-icon-fix"
             [disabled]="showResumeCourse" tabindex="0"
             (click)="resumeCourse(true); this.logTelemetry('course-resume', courseHierarchy)">
             <i class="icon-svg icon-svg--xs icon-play mr-8"><svg class="icon icon-svg--primary">
                 <use xlink:href="assets/images/sprite.svg#play-continue"></use>
               </svg></i>{{resourceService?.frmelmnts?.btn?.continueLearning}}</button>
-        </div> -->
+        </div>
 
         <!-- <h5 class="sb-color-primary font-weight-bold mb-0 sb__ellipsis" tabindex="0" *ngIf="progress===100">You have completed this course</h5> -->
 

diff --git a/src/app/client/src/app/modules/player-helper/components/player/player.component.ts b/src/app/client/src/app/modules/player-helper/components/player/player.component.ts
@@ -461,12 +461,14 @@ export class PlayerComponent implements OnInit, AfterViewInit, OnChanges, OnDest
       contentProgress = CsContentProgressCalculator.calculate(playerSummary, contentMimeType);
     }
 
-    if (event.detail.telemetryData.eid === 'END' && contentProgress === 100 && this.currentPageType === "END" && this.currentPage === this.totalPage) {
-        this.contentRatingModal = !this.isFullScreenView;
+    if (event.detail.telemetryData.eid === 'END' && contentProgress === 100 && this.currentPageType === "END") {
+      if(this.currentPage  && this.currentPage === this.totalPage){  
+      this.contentRatingModal = !this.isFullScreenView;
         this.showRatingModalAfterClose = true;
         if (this.modal) {
           this.modal.showContentRatingModal = true;
         }
+      }
     }
 
 

diff --git a/src/app/resourcebundles/data/consumption/as.properties b/src/app/resourcebundles/data/consumption/as.properties
@@ -1089,6 +1089,7 @@ frmelmnts.lbl.readless=কমকৈ পঢ়ক...
 frmelmnts.lbl.readmore=অধিক পঢ়ক
 frmelmnts.lbl.receiveOTP=আপুনি অটিপি কত পাব বিছাৰে?
 frmelmnts.lbl.recentlyPublishedCourses=শেহতীয়াকৈ প্ৰকাশিত পাঠ্যক্ৰমসমূহ 
+frmelmnts.lbl.recentlyPublishedTextBooks=শেহতীয়াকৈ যোগ কৰা পাঠ্যপুথিৰ দ্বাৰা ব্ৰাউজ কৰক
 frmelmnts.lbl.recoverAccount=একাউণ্ট উদ্ধাৰ কৰক
 frmelmnts.lbl.redirectMsg=এই কনটেন্ট ব্যৱহাৰৰ সুবিধা বাহিৰৰ পৰা কৰা হৈছে 
 frmelmnts.lbl.redirectWaitMsg=অনুগ্ৰহ কৰি বিষয়বস্তু ল’ড হোৱালৈকে অপেক্ষা কৰক

diff --git a/src/app/resourcebundles/data/consumption/bn.properties b/src/app/resourcebundles/data/consumption/bn.properties
@@ -1055,7 +1055,8 @@ frmelmnts.lbl.re_issue=শংসাপত্র পুনরায় বিত
 frmelmnts.lbl.readless=কম করে পড়ুন ...
 frmelmnts.lbl.readmore=... আরো পড়ুন
 frmelmnts.lbl.receiveOTP=আপনি কোথায় ওটিপি পেতে চান?
-frmelmnts.lbl.recentlyPublishedCourses=সম্প্রতি প্রকাশিত কোর্সগুলি 
+frmelmnts.lbl.recentlyPublishedCourses=সম্প্রতি প্রকাশিত কোর্সগুলি
+frmelmnts.lbl.recentlyPublishedTextBooks=সম্প্রতি যোগ করা পাঠ্যপুস্তক দ্বারা ব্রাউজ করুন 
 frmelmnts.lbl.recoverAccount=অ্যাকাউন্ট পুনরুদ্ধার করুন
 frmelmnts.lbl.redirectMsg=বিষয়বস্তুটি বহির্দেশে প্রদর্শিত করা হয়েছে
 frmelmnts.lbl.redirectWaitMsg=বিষয়বস্তু লোড হওয়ার সময় দয়া করে অপেক্ষা করুন

diff --git a/src/app/resourcebundles/data/consumption/en.properties b/src/app/resourcebundles/data/consumption/en.properties
@@ -1074,6 +1074,7 @@ frmelmnts.lbl.readless=Read Less ...
 frmelmnts.lbl.readmore=... Read More
 frmelmnts.lbl.receiveOTP=Where would you like to receive the OTP?
 frmelmnts.lbl.recentlyPublishedCourses=Recently published courses
+frmelmnts.lbl.recentlyPublishedTextBooks=Browse by recently added Textbooks
 frmelmnts.lbl.recoverAccount=Recover Account
 frmelmnts.lbl.redirectMsg=This content is hosted outside
 frmelmnts.lbl.redirectWaitMsg=Wait while the content loads

diff --git a/src/app/resourcebundles/data/consumption/gu.properties b/src/app/resourcebundles/data/consumption/gu.properties
@@ -1089,6 +1089,7 @@ frmelmnts.lbl.readless=ઓછું વાંચો...
 frmelmnts.lbl.readmore=...વધુ વાંચો
 frmelmnts.lbl.receiveOTP=તમે OTP શેમાં મેળવવા માંગો છો?
 frmelmnts.lbl.recentlyPublishedCourses=તાજેતરમાં પ્રકાશિત અભ્યાસક્રમો
+frmelmnts.lbl.recentlyPublishedTextBooks=તાજેતરમાં ઉમેરાયેલ પાઠયપુસ્તકો દ્વારા બ્રાઉઝ કરો
 frmelmnts.lbl.recoverAccount=એકાઉન્ટ પાછુ મેળવો
 frmelmnts.lbl.redirectMsg=આ કન્ટેન્ટ બહાર હોસ્ટ કરેલ છે
 frmelmnts.lbl.redirectWaitMsg=કન્ટેન્ટ લોડ થાય ત્યાં સુધી રાહ જુઓ

diff --git a/src/app/resourcebundles/data/consumption/hi.properties b/src/app/resourcebundles/data/consumption/hi.properties
@@ -1064,6 +1064,7 @@ frmelmnts.lbl.readless=कम पढ़ें...
 frmelmnts.lbl.readmore=...आगे पढ़े
 frmelmnts.lbl.receiveOTP=आप OTP कहाँ पाना चाहते है?
 frmelmnts.lbl.recentlyPublishedCourses=हाल ही में प्रकाशित पाठ्यक्रम
+frmelmnts.lbl.recentlyPublishedTextBooks=हाल ही में जोड़ी गई पाठ्यपुस्तकों द्वारा ब्राउज़ करें
 frmelmnts.lbl.recoverAccount=अकाउंट बहाल कीजिये
 frmelmnts.lbl.redirectMsg=यह कंटेंट बाह्य स्त्रोतों से लिया गया है
 frmelmnts.lbl.redirectWaitMsg=प्रतीक्षा कीजिये, कंटेंट लोड हो रहा हैं...

diff --git a/src/app/resourcebundles/data/consumption/kn.properties b/src/app/resourcebundles/data/consumption/kn.properties
@@ -1075,6 +1075,7 @@ frmelmnts.lbl.readless=ಕಡಿಮೆ ಓದಿ ...
 frmelmnts.lbl.readmore=... ಮತ್ತಷ್ಟು ಓದು
 frmelmnts.lbl.receiveOTP=ಒಟಿಪಿಯನ್ನು ಎಲ್ಲಿ ಪಡೆಯಲು ನೀವು ಬಯಸುವಿರಿ? 
 frmelmnts.lbl.recentlyPublishedCourses=ಇತ್ತೀಚೆಗೆ ಪ್ರಕಟವಾದ ಕೋರ್ಸ್ ಗಳು
+frmelmnts.lbl.recentlyPublishedTextBooks=ಇತ್ತೀಚೆಗೆ ಸೇರಿಸಲಾದ ಪಠ್ಯಪುಸ್ತಕಗಳಿಂದ ಬ್ರೌಸ್ ಮಾಡಿ
 frmelmnts.lbl.recoverAccount=ಅಕೌಂಟ್ ಅನ್ನು ರಿಕವರ್ ಮಾಡಿ
 frmelmnts.lbl.redirectMsg=ಈ ವಿಷಯವನ್ನು ಹೊರಗೆ ಹೋಸ್ಟ್ ಮಾಡಲಾಗಿದೆ
 frmelmnts.lbl.redirectWaitMsg=ಪಠ್ಯಾಂಶ ಲೋಡ್ ಆಗುವವರೆಗೆ ಕಾಯಿರಿ

diff --git a/src/app/resourcebundles/data/consumption/mr.properties b/src/app/resourcebundles/data/consumption/mr.properties
@@ -1056,7 +1056,8 @@ frmelmnts.lbl.re_issue=प्रमाणपत्र पुन्हा जर
 frmelmnts.lbl.readless= कमी वाचा ...
 frmelmnts.lbl.readmore=... अधिक वाचा 
 frmelmnts.lbl.receiveOTP=आपण OTP कुठे घेऊ इच्छिता?
-frmelmnts.lbl.recentlyPublishedCourses=नुकतेच प्रकाशित झालेले कोर्सेस 
+frmelmnts.lbl.recentlyPublishedCourses=नुकतेच प्रकाशित झालेले कोर्सेस
+frmelmnts.lbl.recentlyPublishedTextBooks=नुकत्याच जोडलेल्या पाठ्यपुस्तकांद्वारे ब्राउझ करा 
 frmelmnts.lbl.recoverAccount=अकाउंट परत मिळवा 
 frmelmnts.lbl.redirectMsg=हा मजकूर बाहेर होस्ट केलेला आहे 
 frmelmnts.lbl.redirectWaitMsg=कृपया मजकूर लोड होईपर्यंत थांबा 

diff --git a/src/app/resourcebundles/data/consumption/or.properties b/src/app/resourcebundles/data/consumption/or.properties
@@ -1061,6 +1061,7 @@ frmelmnts.lbl.readless=କମ ପଢନ୍ତୁ
 frmelmnts.lbl.readmore=ଅଧିକ ପଢନ୍ତୁ 
 frmelmnts.lbl.receiveOTP=ଆପଣ କେଉଁଥିରେ ଆପଣଙ୍କ OTP ଗ୍ରହଣ କରିବାକୁ ଚାହାନ୍ତି ?
 frmelmnts.lbl.recentlyPublishedCourses=ନିକଟରେ ପବ୍ଲିସ୍ ହୋଇଥିବା କୋର୍ସ
+frmelmnts.lbl.recentlyPublishedTextBooks=ନିକଟରେ ଯୋଡାଯାଇଥିବା ପାଠ୍ୟପୁସ୍ତକ ଗୁଡିକ ଦ୍ୱାରା ବ୍ରାଉଜ କରନ୍ତୁ
 frmelmnts.lbl.recoverAccount=ଆକାଉଣ୍ଟ ରିକଭର୍ କରନ୍ତୁ
 frmelmnts.lbl.redirectMsg=ଏହି ସାମଗ୍ରୀକୁ ବାହାର ଉପସ୍ଥାପନା କରାଯାଉଅଛି 
 frmelmnts.lbl.redirectWaitMsg=ଦୟାକରି କଣ୍ଟେଣ୍ଟ୍ ଲୋଡ଼ ହେବା ପର୍ଯ୍ୟନ୍ତ ଅପେକ୍ଷା କରନ୍ତୁ

diff --git a/src/app/resourcebundles/data/consumption/pa.properties b/src/app/resourcebundles/data/consumption/pa.properties
@@ -1090,6 +1090,7 @@ frmelmnts.lbl.readless=ਘੱਟ ਪੜ੍ਹੋ ...
 frmelmnts.lbl.readmore=... ਹੋਰ ਪੜ੍ਹੋ
 frmelmnts.lbl.receiveOTP=ਤੁਸੀਂ OTP ਕਿੱਥੇ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?
 frmelmnts.lbl.recentlyPublishedCourses=ਹਾਲ ਹੀ ਵਿੱਚ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੇ ਗਏ ਕੋਰਸ
+frmelmnts.lbl.recentlyPublishedTextBooks=ਹਾਲ ਹੀ ਵਿੱਚ ਸ਼ਾਮਲ ਕੀਤੀਆਂ ਪਾਠ ਪੁਸਤਕਾਂ ਦੁਆਰਾ ਬ੍ਰਾਊਜ਼ ਕਰੋ
 frmelmnts.lbl.recoverAccount=ਖਾਤਾ ਦੁਬਾਰਾ ਪ੍ਰਾਪਤ ਕਰੋ
 frmelmnts.lbl.redirectMsg=ਇਹ ਕੰਟੇਂਟ ਬਾਹਰ ਤੋ ਲਿਆ ਗਿਆ ਹੈ
 frmelmnts.lbl.redirectWaitMsg=ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ ਕੰਟੇਂਟ ਲੋਡ ਹੋ ਰਹਿਆ ਹੈ

diff --git a/src/app/resourcebundles/data/consumption/ta.properties b/src/app/resourcebundles/data/consumption/ta.properties
@@ -1062,7 +1062,8 @@ frmelmnts.lbl.re_issue=சான்றிதழ் மறு வெளியீ
 frmelmnts.lbl.readless=குறைவாக படிக்க...
 frmelmnts.lbl.readmore=...மேலும் படிக்க
 frmelmnts.lbl.receiveOTP=OTP ஐ எதில் பெற விரும்புகிறீர்கள்?
-frmelmnts.lbl.recentlyPublishedCourses=சமீபத்தில் வெளியிடப்பட்ட பாடநெறிகள் 
+frmelmnts.lbl.recentlyPublishedCourses=சமீபத்தில் வெளியிடப்பட்ட பாடநெறிகள்
+frmelmnts.lbl.recentlyPublishedTextBooks=சமீபத்தில் சேர்க்கப்பட்ட பாடப்புத்தகங்களை உலாவவும்
 frmelmnts.lbl.recoverAccount=கணக்கை மீட்க
 frmelmnts.lbl.redirectMsg=இந்த பாடம் வெளியே வழங்கப்பட்டுள்ளது 
 frmelmnts.lbl.redirectWaitMsg=பாடம் லோடாகிக் கொண்டிருக்கிறது  தயவுசெய்து காத்திருக்கவும் 

diff --git a/src/app/resourcebundles/data/consumption/te.properties b/src/app/resourcebundles/data/consumption/te.properties
@@ -1074,6 +1074,7 @@ frmelmnts.lbl.readless=తక్కువ చదవండి ...
 frmelmnts.lbl.readmore=...ఇంకా చదవండి
 frmelmnts.lbl.receiveOTP=nమీరు OTP ను ఎక్కడ స్వీకరించాలనుకుంటున్నారు?
 frmelmnts.lbl.recentlyPublishedCourses=ఇటీవల ప్రచురించిన కోర్సులు
+frmelmnts.lbl.recentlyPublishedTextBooks=ఇటీవల జోడించిన పాఠ్యపుస్తకాల ద్వారా బ్రౌజ్ చేయండి
 frmelmnts.lbl.recoverAccount=nఖాతాను పునరుద్ధరించండి
 frmelmnts.lbl.redirectMsg=ఈ కంటెంట్ వెలుపల హోస్ట్ చేయబడింది
 frmelmnts.lbl.redirectWaitMsg=దయచేసి కంటెంట్ లోడ్ అవుతున్నప్పుడు వేచి ఉండండి

diff --git a/src/app/resourcebundles/data/consumption/ur.properties b/src/app/resourcebundles/data/consumption/ur.properties
@@ -1071,6 +1071,7 @@ frmelmnts.lbl.readless=کم پڑھئیے
 frmelmnts.lbl.readmore=...مزید پڑھئے
 frmelmnts.lbl.receiveOTP=آپ کہاں OTP وصول کرنا چاہیں گے؟
 frmelmnts.lbl.recentlyPublishedCourses=حال ہی میں شائع کورسز
+frmelmnts.lbl.recentlyPublishedTextBooks= حال ہی میں شامل کردہ نصابی کتابوں سے براؤز کریں
 frmelmnts.lbl.recoverAccount=اکاؤنٹ بازیافت کریں۔
 frmelmnts.lbl.redirectMsg= اس مواد کی بیرونی طور پر میزبانی کی جاتی ہے
 frmelmnts.lbl.redirectWaitMsg=مواد  لوڈ ہونے تک انتظار کریں

diff --git a/src/app/resourcebundles/json/as.json b/src/app/resourcebundles/json/as.json
diff --git a/src/app/resourcebundles/json/bn.json b/src/app/resourcebundles/json/bn.json
diff --git a/src/app/resourcebundles/json/en.json b/src/app/resourcebundles/json/en.json
diff --git a/src/app/resourcebundles/json/gu.json b/src/app/resourcebundles/json/gu.json
diff --git a/src/app/resourcebundles/json/hi.json b/src/app/resourcebundles/json/hi.json
diff --git a/src/app/resourcebundles/json/kn.json b/src/app/resourcebundles/json/kn.json
diff --git a/src/app/resourcebundles/json/mr.json b/src/app/resourcebundles/json/mr.json
diff --git a/src/app/resourcebundles/json/or.json b/src/app/resourcebundles/json/or.json
diff --git a/src/app/resourcebundles/json/pa.json b/src/app/resourcebundles/json/pa.json
diff --git a/src/app/resourcebundles/json/ta.json b/src/app/resourcebundles/json/ta.json
diff --git a/src/app/resourcebundles/json/te.json b/src/app/resourcebundles/json/te.json
diff --git a/src/app/resourcebundles/json/ur.json b/src/app/resourcebundles/json/ur.json