Updated

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

ecm/Angular/ProteusECM/trunk/src/app/ecm-card/ecm-card.component.html

@@ -40,7 +40,7 @@
 </div>
 
 <div *ngIf="itemData" class="ecm-card" id="ecm-item" (click)="viewItem()">
-	<ecm-image [refId]='itemData.itemCode' [refSer]="'M-ITEM'" [object]="'ITEM'" [isSingleImage] = "true" ></ecm-image>	
+	<ecm-image [isThumbnail]="true" [refId]='itemData.itemCode' [refSer]="'M-ITEM'" [object]="'ITEM'" [isSingleImage] = "true" ></ecm-image>	
 	<div class="ecm-card-footer" id="ecm-item-footer">
 		<div class="ecm-card-info" id="ecm-item-info">
 			<span id="ecm-item-info-title" class="ecm-card-info-title">{{itemData.descr}}</span> 		

ecm/Angular/ProteusECM/trunk/src/app/ecm-model/product-detail-model.ts

@@ -3,31 +3,20 @@
  * {catCode, curRank, descr, shDescr, ecmTemplate}
  */
 export class ItemDetail {
-    public itemCategory: any;
-    public itemSubCategory: any;
-    public itemCode: string = '';
-    public itemShDescr: string = '';
-    public itemDescr: string = '';
-    public itemOverview: string = '';
-    public itemCostRate: number;
-    public itemDiscount: number;
-    public itemDiscountedRate: number;
-    public itemNumOfReviews: number;
-    public itemAvgRating: number;
-    public itemRatings: any; //any = [{ 1 : 10 },{ 2 : 15 },{ 3 : 30 },{ 4 : 25 },{ 5 : 50 }];
-    public itemDetailData: any;
+
+      public itemCode: string = '';
+      public itemCategory: any; // JSON String
+      public itemSubCategory: any; // JSON String
+      public itemHeader: any; // JSON String
+      public itemDetail1: any; // JSON String
+      public itemDetail2: any; // JSON String
+      public itemRatings: any; // JSON String
+      public itemVariants: any; // JSON String
+
     /* 
         any = { "itemPackages": [{"package": "Experienced Instructor"},{"package":"Meal(option)"}, {"package":"Large group concession"}],
                 "itemExtraInfo" : "Discount valid till 31st July 2017 ",
                 "itemVenue"     : "Mumbai"
               };
     */
-//    public getItemDetailData() : any {
-//        console.log( 'this.itemDetailData >> ' + this.itemDetailData );
-//        return JSON.parse(this.itemDetailData)
-//    }
-//    public getItemRatings() : any {
-//        console.log( 'this.itemRatings >> ' + this.itemRatings );
-//        return JSON.parse(this.itemRatings)
-//    }
 }

ecm/Angular/ProteusECM/trunk/src/app/ecm-model/product-model.ts

@@ -5,6 +5,7 @@
 export class Item {
       public itemCode: string = '';
       public descr: string = '';
+      public shDescr: string = '';
       public costRate: string;
       public rating: number;
       public scat_sh_descr: string = '';

ecm/Angular/ProteusECM/trunk/src/app/ecm-product-details/ecm-product-details.component.ts

@@ -120,7 +120,7 @@ export class EcmProductDetailsComponent implements OnInit {
     let cartData = new ECMCart;
     cartData.itemCode = data;
     cartData.quantity = 1;
-    cartData.itemCost = this.itemDetail.itemCostRate;
+    cartData.itemCost = this.itemDetail.itemHeader.itemCostRate;
     
     this.store.dispatch({ type: INCREMENT, payload: cartData });
     this.subcategoryService.addToCart(cartData);

ecm/Angular/ProteusECM/trunk/src/app/ecm-product-details/ecm-product-review.component.ts

@@ -44,7 +44,7 @@ export class EcmProductReviewComponent implements OnInit {
     loadReviews(itemDetail){
         this.itemDetail = itemDetail;
         this.itemCode = this.itemDetail.itemCode;
-        this.itemAvgRating = this.itemDetail.itemAvgRating;
+        this.itemAvgRating = this.itemDetail.itemRatings.AVG_RATING;
         
         this.fetchReviews();
     }

ecm/Angular/ProteusECM/trunk/src/app/ecm-product-details/ecm-template/ecm-celebration.component.ts

@@ -35,11 +35,7 @@ export class EcmCelebrationComponent implements OnInit, EcmTemplateInterface {
         this.route.params.subscribe( params => {
             this.itemCode = params['key'];
         });
-        this.actionPerformed = this.itemDetail.itemDetailData.itemDetail2.actionPerformed;
-        this.activityPerformed = this.itemDetail.itemDetailData.itemDetail2.activityPerformed;
-        this.transPortFacility = this.itemDetail.itemDetailData.itemDetail2.transportFacility;
-        this.thingsToCarry = this.itemDetail.itemDetailData.itemDetail2.thingsToCarry;
-        this.itemDetailpath = this.itemDetail.itemDetailData.itemDetail2
+
         this.myCity = localStorage.getItem( 'mycity' );
 
     }

ecm/Angular/ProteusECM/trunk/src/app/ecm-product-details/ecm-template/ecm-food.component.ts

@@ -40,9 +40,7 @@ export class EcmFoodComponent implements OnInit, EcmTemplateInterface {
         this.route.params.subscribe( params => {
             this.itemCode = params['key'];
         });
-        this.itemDetailpath = this.itemDetail.itemDetailData.itemDetail2
-        this.ingredients = this.itemDetail.itemDetailData.itemDetail2.ingredients;
-        this.Preferences = this.itemDetail.itemDetailData.itemDetail2.Preferences;
+
         this.myCity = localStorage.getItem( 'mycity' );
     }