Merge pull request #589 from sunbird-cb/nic-setup-errors

Nic setup errors
sunbird-cb · Oct 14, 2022 · 19e6f9d · 19e6f9d
2 parents ae7bf53 + 05eaf11
commit 19e6f9d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/project/ws/app/src/lib/routes/app-toc/components/app-toc-banner/app-toc-banner.component.ts b/project/ws/app/src/lib/routes/app-toc/components/app-toc-banner/app-toc-banner.component.ts
@@ -274,7 +274,6 @@ export class AppTocBannerComponent implements OnInit, OnChanges, OnDestroy {
     })
   }
 
-
   getMimeType(content: NsContent.IContent, identifier: string): NsContent.EMimeTypes {
     if (content.identifier === identifier) {
       return content.mimeType
@@ -292,7 +291,7 @@ export class AppTocBannerComponent implements OnInit, OnChanges, OnDestroy {
       const getAllItemsPerChildren: any = (item: NsContent.IContent) => {
         flatList.push(item)
         if (item.children) {
-          return item.children.map((i: NsContent.IContent) => getAllItemsPerChildren(i));
+          return item.children.map((i: NsContent.IContent) => getAllItemsPerChildren(i))
         }
         return
       }

diff --git a/...rc/lib/routes/app-toc/components/app-toc-content-card/app-toc-content-card.component.html b/...rc/lib/routes/app-toc/components/app-toc-content-card/app-toc-content-card.component.html
@@ -192,11 +192,13 @@
 
     <div class="flex flex-col sm:flex-row flex-between width-expand pr-0 w-100 sm:pr-4 sm:w-auto">
        <!-- deactivated as per NIC CEO requirement to access course wthout login -->
-      <!-- <a [routerLink]="isAllowed && !forPreview ? resourceLink.url : null"
+      <!-- <a [routerLink]="isAllowed && !forPreview && enrolled ? resourceLink.url : null"
         [queryParams]="isAllowed  ? resourceLink.queryParams : null"> -->
 
-        <a [routerLink]="isAllowed ? resourceLink.url : null"
-        [queryParams]="isAllowed  ? resourceLink.queryParams : null">
+        <a class="disabled">
+
+        <!-- <a [routerLink]="isAllowed ? resourceLink.url : null"
+        [queryParams]="isAllowed  ? resourceLink.queryParams : null"> -->
                 <div class="text-truncate cursor-pointer" (click)="viewChildren = !viewChildren; raiseTelemetry()">
           <div class="flex flex-col sm:flex-row flex-wrap">
             <p class="margin-remove text-truncate mat-subheading-1 flex-auto">

diff --git a/...routes/profile-v3/components/current-competency-card/current-competency-card.component.ts b/...routes/profile-v3/components/current-competency-card/current-competency-card.component.ts
@@ -44,13 +44,12 @@ export class CurrentCompetencyCardComponent implements OnInit {
       // this.selectedCompetency.emit(this.selectedCompList)
     } else {
       if (_.findIndex(this.compLocalService.currentComps.value, { id: competency.id }) !== -1) {
-        // if (_.findIndex(this.compLocalService.currentComps.value, { competencySelfAttestedLevel: complevel.id }) !== -1) {
-        //   // this.compLocalService.removecurrentComps(compobj)
-        // }
-        //  else {
+        if (_.findIndex(this.compLocalService.currentComps.value, { competencySelfAttestedLevel: complevel.id }) !== -1) {
+          this.compLocalService.removecurrentComps(compobj)
+        } else {
           this.compLocalService.removecurrentComps(compobj)
           this.compLocalService.addcurrentComps(compobj)
-        // }
+        }
       }
     }
   }

diff --git a/project/ws/app/src/lib/routes/profile-v3/components/topic-card/topic-card.component.ts b/project/ws/app/src/lib/routes/profile-v3/components/topic-card/topic-card.component.ts
@@ -49,12 +49,14 @@ export class TopicCardComponent implements OnInit {
     if (top) {
       if (typeof (top) !== 'object') {
         const index = _.indexOf(this.topicService.getCurrentSelectedDesTopics, top)
+
         if (index === -1) {
           return false
         }
         return true
       }
       const index1 = _.findIndex(this.topicService.getCurrentSelectedSysTopics, { identifier: top.identifier })
+
       if (index1 === -1) {
         return false
       }

diff --git a/...src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.scss b/...src/lib/routes/profile-v3/routes/roles-and-activities/roles-and-activities.component.scss
@@ -67,9 +67,9 @@ a.hint_span {
     color: rgba($color: #000000, $alpha: .4);
 }
 
-.mat-subheading-1{
-    margin-left: 10px;
-}
+// .mat-subheading-1{
+//     margin-left: 10px;
+// }
 
 .left-input-div {
     width: 74%;

diff --git a/project/ws/viewer/src/lib/plugins/practice/practice.component.ts b/project/ws/viewer/src/lib/plugins/practice/practice.component.ts
@@ -595,8 +595,8 @@ export class PracticeComponent implements OnInit, OnChanges, OnDestroy {
     // debugger
     // console.log(this.questionAnswerHash, '+++++')
     if (question.questionType && question.questionType === 'mtf') {
-      const mTfval=this.quizSvc.mtfSrc.getValue()
-      mTfval[question.questionId]= {
+      const mTfval = this.quizSvc.mtfSrc.getValue()
+      mTfval[question.questionId] = {
         source: _.map(optionId, 'source.innerText'),
         target: _.map(optionId, 'target.innerText'),
       }