Merge pull request #2409 from bharathravi-in/show-info-maintanence

Show info maintanence
sunbird-cb · Aug 16, 2024 · bfbca24 · bfbca24
2 parents 26bb48f + 6a774a9
commit bfbca24
Show file tree

Hide file tree

Showing 11 changed files with 100 additions and 44 deletions.
diff --git a/library/ws-widget/collection/src/lib/card-content-v2/card-content-v2.component.html b/library/ws-widget/collection/src/lib/card-content-v2/card-content-v2.component.html
@@ -627,19 +627,7 @@ <h2 class="ws-mat-primary-text mat-title title-text"> {{ widgetData.content.name
             </div>
           </div>
         </div>
-        <div class="flex flex-1 flex-row">
-          <div class="flex-9 description-text mb-4" i18n-title title="Description">
-            {{'cardcontentv2.askedBy' | translate}} <a (click)="raiseTelemetry(); $event.stopPropagation()" [routerLink]="['/app/person-profile']"
-              [queryParams]="{'emailId':'amit.sengar@tarento.com'}" role="link" aria-label="Content" i18n-aria-label>
-              <span class="ws-mat-default-text">{{'Amit Kumar'}}</span>
-            </a>
-          </div>
-          <div class="flex flex-1">
-            <div class="typeofc">
-              <span>Law</span>
-            </div>
-          </div>
-        </div>
+
         <div class="flex flex-1 flex-row">
           <div class="flex flex-1">
             <div class="flex flex-1 flex-row">

diff --git a/library/ws-widget/collection/src/lib/card-content/card-content.component.html b/library/ws-widget/collection/src/lib/card-content/card-content.component.html
@@ -737,19 +737,7 @@ <h2 class="ws-mat-primary-text mat-title title-text"> {{ widgetData.content.name
             </div>
           </div>
         </div>
-        <div class="flex flex-1 flex-row">
-          <div class="flex-9 description-text mb-4" i18n-title title="Description">
-            Asked by <a (click)="raiseTelemetry(); $event.stopPropagation()" [routerLink]="['/app/person-profile']"
-              [queryParams]="{'emailId':'amit.sengar@tarento.com'}" role="link" aria-label="Content" i18n-aria-label>
-              <span class="ws-mat-default-text">{{'Amit Kumar'}}</span>
-            </a>
-          </div>
-          <div class="flex flex-1">
-            <div class="typeofc">
-              <span>Law</span>
-            </div>
-          </div>
-        </div>
+
         <!-- <mat-accordion>
           <mat-expansion-panel class="no-box" (opened)="panelOpenState = true" (closed)="panelOpenState = false">
             <mat-expansion-panel-header #panelH (click)="panelH._toggle()">

diff --git a/project/ws/app/src/lib/routes/app-toc/components/app-toc-home/app-toc-home.component.ts b/project/ws/app/src/lib/routes/app-toc/components/app-toc-home/app-toc-home.component.ts
@@ -751,17 +751,21 @@ export class AppTocHomeComponent implements OnInit, OnDestroy, AfterViewChecked,
       if (batch && this.currentCourseBatchId) {
         this.startDate = (_.get(batch, 'startDate'))
         this.endDate = (_.get(batch, 'endDate'))
-        const startDateTime = this.startDate && new Date(this.startDate).getTime()
-        const endDateTime = this.endDate && new Date(this.endDate).getTime()
-        this.startDateDifference = now - startDateTime
-        this.endDateDifference = endDateTime - now
-        if (this.endDateDifference > 0 && this.startDateDifference > 0 && batch.status !== 2) {
-          return true
+        if (this.endDate) {
+          const startDateTime = this.startDate && new Date(this.startDate).getTime()
+          const endDateTime = this.endDate && new Date(this.endDate).getTime()
+          this.startDateDifference = now - startDateTime
+          this.endDateDifference = endDateTime - now
+          if (this.endDateDifference > 0 && this.startDateDifference > 0 && batch.status !== 2) {
+            return true
+          }
+          return false
         }
-        return false
+        return true
       }
       return false
-    } return false
+    }
+    return false
   }
 
   private initData(data: Data) {

diff --git a/src/app/component/app-nav-bar/app-nav-bar.component.html b/src/app/component/app-nav-bar/app-nav-bar.component.html
@@ -1,5 +1,15 @@
+<div class="info-block" *ngIf="infoBlockEnable">
+  <div class="flex container-balanced items-center justify-between info-wrapper">
+      <div class="flex  items-center">
+          <span class="material-icons mat-icon text-white margin-right">warning</span>
+          <span class="info-txt text-white">Dear Karmayogi, our portal will be undergoing a technology upgrade from 10 PM today till 18th August, 10 PM to improve your learning experience.</span>
+      </div>
+      <div>
+          <a  (click)="infoBlockActionMethod()" class="ok-btn text-white">OK</a>
+      </div>
+  </div>
+</div>
 <ng-container *ngIf="fullMenuDispaly">
-
   <mat-toolbar *ngIf="sShowAppNavBar && !needToHide && mode == 'top' && isHubEnable"
     [color]="primaryNavbarBackground?.color" [ngStyle]="primaryNavbarBackground?.styles"
     class="mat-elevation-z3 custom mobile-height" [ngClass]="{'mobile': isHubEnable}">
@@ -223,3 +233,4 @@
   </div>
 
 </mat-menu>
+
diff --git a/src/app/component/app-nav-bar/app-nav-bar.component.scss b/src/app/component/app-nav-bar/app-nav-bar.component.scss
@@ -1,5 +1,11 @@
 @import 'ws-mixins';
 @import 'ws-vars';
+@import 'ws-common';
+
+
+.container-balanced {
+  @extend %page-center;
+}
 
 .hideForNav {
   display: none !important;
@@ -428,3 +434,40 @@
     }
   }
 }
+
+
+.info-block {
+  width: 100%;
+  // height: 48px;
+  background: linear-gradient(90.15deg, #266EEB 0.87%, #133F8B 161.81%);
+  .info-wrapper {
+      padding: 16px 0;
+      .margin-right {
+          margin-right: 8px;
+      }
+      .info-txt {
+          //styleName: Caption;
+          font-family: Lato;
+          font-size: 13px;
+          font-weight: 400;
+          line-height: 14.4px;
+          text-align: left;
+
+      }
+      .ok-btn {
+          border: 1px solid white;
+          cursor: pointer;
+          padding: 4px 16px;
+          gap: 8px;
+          border-radius: 12px;
+          //styleName: Button;
+          font-family: Lato;
+          font-size: 14px;
+          font-weight: 700;
+          line-height: 16.8px;
+          text-align: center;
+
+
+      }
+  }
+}
diff --git a/src/app/component/app-nav-bar/app-nav-bar.component.ts b/src/app/component/app-nav-bar/app-nav-bar.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'
 import { DomSanitizer, SafeUrl } from '@angular/platform-browser'
 import { Router, NavigationStart, NavigationEnd } from '@angular/router'
 import { TranslateService } from '@ngx-translate/core'
@@ -17,6 +17,10 @@ import { UrlService } from 'src/app/shared/url.service'
 export class AppNavBarComponent implements OnInit, OnChanges {
   @Input() mode: 'top' | 'bottom' = 'top'
   @Input() headerFooterConfigData: any
+// tslint:disable-next-line:indent
+	@Output() infoBlockAction = new EventEmitter()
+
+  infoBlockEnable = true
   hideKPOnNav = false
   basicBtnAppsConfig: NsWidgetResolver.IRenderConfigWithTypedData<IBtnAppsConfig> = {
     widgetType: 'actionButton',
@@ -376,4 +380,9 @@ export class AppNavBarComponent implements OnInit, OnChanges {
     return { ...item, forPreview: !this.isforPreview, enableLang: this.enableLang }
   }
 
+  infoBlockActionMethod() {
+    this.infoBlockEnable = !this.infoBlockEnable
+    this.infoBlockAction.emit(this.infoBlockEnable)
+  }
+
 }
diff --git a/src/app/component/app-tour-video/app-tour-video.component.ts b/src/app/component/app-tour-video/app-tour-video.component.ts
@@ -35,7 +35,7 @@ export class AppTourVideoComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.environment = environment
-    this.videoUrl = `https://${this.environment.sitePath}/content-store/Website_Video.mp4`
+    this.videoUrl = `https://${this.environment.sitePath}/assets/public/content/guide-videos/Website_Video.mp4`
     try {
       if (this.videoProgressTime > 0) {
         this.videoPlayedProgress = false

diff --git a/src/app/component/download-app/download-app.component.html b/src/app/component/download-app/download-app.component.html
@@ -1,5 +1,5 @@
 <div style="width:100%;background-color: #fff;">
-    <div class="dialog-close" *ngIf="!isMobile" (click)="closePopup()"><img alt="" src="assets/icons/home/decline_icon.svg" type="button"></div>
+    <div class="dialog-close" *ngIf="!isMobile && popupClass" (click)="closePopup()"><img alt="" src="assets/icons/home/decline_icon.svg" type="button"></div>
     <div [ngClass]="popupClass === 'download-app-popup' ? 'download-app-popup' : 'download-app'" *ngIf="!isMobile">
         <ng-container>
             <div class="left-side">

diff --git a/src/app/header/header/header.component.html b/src/app/header/header/header.component.html
@@ -1,4 +1,4 @@
-<div [ngClass]="mobileTopHeaderVisibilityStatus ? 'mobile-download-app-top-header' : 'mobile-download-app-without-top-header'" *ngIf="mobileTopHeaderVisibilityStatus">
+<div [ngClass]="mobileTopHeaderVisibilityStatus ? 'mobile-download-app-top-header' : 'mobile-download-app-without-top-header'" *ngIf="mobileTopHeaderVisibilityStatus && !infoBlockEnable">
     <div class="cross-mobile-download-app" (click)="hideMobileTopHeader()">
         <span>X</span>
     </div>
@@ -15,7 +15,7 @@
         </li>
     </div>
 </div>
-<ws-app-nav-bar *ngIf="isNavBarRequired" [ngClass]="mobileTopHeaderVisibilityStatus ? 'top-nav-bar':'top-nav-bar-without-mobile-header'" [mode]="mode" [headerFooterConfigData]="headerFooterConfigData"></ws-app-nav-bar>
-<div *ngIf="showHubs" [ngClass]="mobileTopHeaderVisibilityStatus ? 'height-on-top':'height-on-top-without-mobile-header'">
-    <ws-widget-grid-layout [widgetData]="widgetData"></ws-widget-grid-layout>
+<ws-app-nav-bar *ngIf="isNavBarRequired" (infoBlockAction)="infoBlockAction($event)" [ngClass]="mobileTopHeaderVisibilityStatus ?  'top-nav-bar':'top-nav-bar-without-mobile-header'" [mode]="mode" [headerFooterConfigData]="headerFooterConfigData"></ws-app-nav-bar>
+<div *ngIf="showHubs" [ngClass]="mobileTopHeaderVisibilityStatus ? infoBlockEnable ? 'height-on-top height-top-info' : 'height-on-top':'height-on-top-without-mobile-header'">
+    <ws-widget-grid-layout  [widgetData]="widgetData"></ws-widget-grid-layout>
 </div>
diff --git a/src/app/header/header/header.component.scss b/src/app/header/header/header.component.scss
@@ -1,9 +1,12 @@
 @import 'ws-vars';
 @import 'ws-mixins';
-
+@import 'ws-common';
 ws-app-nav-bar {
   z-index: 1000;
 }
+.container-balanced {
+  @extend %page-center;
+}
 
 .route-change {
   position: fixed;
@@ -322,4 +325,9 @@ ws-app-nav-bar {
     padding: 5px 5px !important;
     list-style: none;
   }
-}
+}
+
+
+.height-top-info {
+  margin-top: 112px !important;
+}
diff --git a/src/app/header/header/header.component.ts b/src/app/header/header/header.component.ts
@@ -15,6 +15,7 @@ export class HeaderComponent implements OnInit {
   isNavBarRequired = true
   showNavbar = true
   widgetData = {}
+  infoBlockEnable = true
   mobileTopHeaderVisibilityStatus = true
   @Input() mode: any
   @Input() headerFooterConfigData: any
@@ -76,4 +77,8 @@ export class HeaderComponent implements OnInit {
     this.mobileTopHeaderVisibilityStatus = false
     this.mobileAppsService.mobileTopHeaderVisibilityStatus.next(this.mobileTopHeaderVisibilityStatus)
   }
+
+  infoBlockAction(eventData: any) {
+    this.infoBlockEnable = eventData
+  }
 }