Updated

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174230 ce508802-f39f-4f6c-b175-0d175dae99d5

ecm/Angular/trunk/src/app/ecm-nav-menu/ecm-nav-menu.component.html

@@ -46,7 +46,7 @@
 						</a>
 					</div>
 					<div *ngIf="_subcategory.list.length > 4">
-						<span class="view-all" (click)="viewAllProducts(_subcategory);">View All</span>
+						<span class="view-all" (click)="viewAllProducts(_subcategory, hoverIdx);">View All</span>
 					</div>
 				</div>
 				

ecm/Angular/trunk/src/app/ecm-nav-menu/ecm-nav-menu.component.ts

@@ -66,14 +66,16 @@ export class ECMNavMenuComponent implements OnInit {
       }
   }
   
-  viewAllProducts(subcategory) {
-      console.log('viewAllProducts');
+  viewAllProducts(subcategory, hoverIdx) {
+      console.log('viewAllProducts for subcat:',subcategory);
       //this.closePanel.emit();
       //this.store.dispatch( this.subCategoryAction.getSubCategorySuccess(subcategory) );
       
       //let category = this.categoryList.find( category => category.catCode === subcategory.catCode);
       //this.store.dispatch(this.categoryAction.getCategorySuccess(category));
       this.closePanel.emit();
+      this.store.dispatch( this.subCategoryAction.resetSubCategoryList() );
+      this.store.dispatch( this.subCategoryAction.loadSubCategories( this.categoryList[hoverIdx].catCode ) );
       this.store.dispatch( this.itemAction.resetItemList() );
       this.store.dispatch( this.itemAction.loadItems( subcategory.scatCode ) );
       this.router.navigate( ['/products', subcategory.scatCode] );

ecm/Angular/trunk/src/app/ecm-view/ecm-product/ecm-product.component.html

@@ -51,7 +51,7 @@
 				<div class="row">
 					<div class="ecm-section-info">
 						<span class="ecm-section-info-title">{{subcategory?.shDescr}}</span>
-						<span class="ecm-total-items">( {{(items | async)?.length}} Items )</span>
+						<span class="ecm-total-items">( {{items?.length}} Items )</span>
 					<!-- 	<span class="ecm-section-info-subhead">{{subcategory?.descr}}</span>   -->
 					</div>
 					<div class="ecm-item-card-detail">

ecm/Angular/trunk/src/app/ecm-view/ecm-sub-category/ecm-sub-category.component.html

@@ -24,7 +24,7 @@
 				<span *ngIf="category" class="ecm-section-info-title">{{category?.shDescr}}</span>
 				<span *ngIf="category" class="ecm-section-info-subhead">{{category?.descr}}</span>
 			</div>
-			<div class="small-12 medium-6 large-4 column end " *ngFor="let _subcategory of subcategories | async">
+			<div class="small-12 medium-6 large-4 column end " *ngFor="let _subcategory of subcategories">
 				<ecm-card (storeData)="storeSubCategory(_subcategory)" [subcategory]="_subcategory"></ecm-card>
 			</div>
 		</div>

ecm/Angular/trunk/src/app/ecm-view/ecm-sub-category/ecm-sub-category.component.ts

@@ -28,7 +28,7 @@ export class EcmSubCategoryComponent implements OnInit {
         this.position = window.pageYOffset;
     }
 
-    private subcategories: Observable<SubCategory[]>;
+    private subcategories;
     private extra_param = { "catCode": '', "catShDesc": '', scatDesc: '' };
 
     private category: Category;
@@ -50,14 +50,17 @@ export class EcmSubCategoryComponent implements OnInit {
     }
 
     getSubCategories( catCode: string ) {
-        this.subcategories = this.store.select( 'subcategories' );
+         this.store.select( 'subcategories' ).subscribe(
+                subcategories => {
+                    this.subcategories =  subcategories;
+                }
+        );
         
         let categories: Observable<Category[]> = this.store.select('categories');
-        let category;
         categories.subscribe( items => {
-            category = items.find(x => x.catCode === catCode);
-            if(category){
-                let breadcrumb = [{label: 'Home', url: '/home'}, {label: category.shDescr, url: 'javascript:void(0)'}];
+            this.category = items.find(x => x.catCode === catCode);
+            if(this.category){
+                let breadcrumb = [{label: 'Home', url: '/home'}, {label: this.category.shDescr, url: 'javascript:void(0)'}];
                 this.breadcrumbSerivce.breadcrumbs = breadcrumb;
             }
          });