Skip to content

B
business-java
Commit 9dead783 authored by prumde's avatar prumde
Browse files
Options

Updated 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174402 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2c825692
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 62 deletions
ecm/Angular/ProteusECM/trunk/src/app/ecm-image/ecm-image.component.css
View file @ 9dead783
...@@ -99,3 +99,9 @@ ...@@ -99,3 +99,9 @@
.close-button:after { .close-button:after {
transform: translateY(-50%) rotate(-45deg) scale(1); transform: translateY(-50%) rotate(-45deg) scale(1);
} }
.img-mask {
width: 100%;
height: 100%;
position: absolute;
}
ecm/Angular/ProteusECM/trunk/src/app/ecm-image/ecm-image.component.html
View file @ 9dead783
<div *ngIf="isThumbnail" class="img-mask"> </div>
<div *ngIf="!attachType" class="img-loading" #loadingImage></div> <div *ngIf="!attachType" class="img-loading" #loadingImage></div>
<div *ngIf="!attachType" class="ecm-image" #targetAttachImage></div> <div *ngIf="!attachType" class="ecm-image" #targetAttachImage></div>
<img *ngIf="attachType == 'Image'" class="ecm-image" #targetImage /> <img *ngIf="attachType == 'Image'" class="ecm-image" #targetImage />
<img *ngIf="attachType == 'Icon'" class="ecm-image-icon" #targetImage /> <img *ngIf="attachType == 'Icon'" class="ecm-image-icon" #targetImage />
\ No newline at end of file
ecm/Angular/ProteusECM/trunk/src/app/ecm-image/ecm-image.component.ts
View file @ 9dead783
...@@ -17,7 +17,8 @@ export class EcmImageComponent implements OnInit, AfterViewChecked { ...@@ -17,7 +17,8 @@ export class EcmImageComponent implements OnInit, AfterViewChecked {
@Input() isSingleImage : any; @Input() isSingleImage : any;
@Input() height : string; @Input() height : string;
@Input() width : any; @Input() width : any;
@Input() isThumbnail: boolean = false;
@ViewChild('targetAttachImage') targetDiv:ElementRef; @ViewChild('targetAttachImage') targetDiv:ElementRef;
@ViewChild('targetImage') targetImg:ElementRef; @ViewChild('targetImage') targetImg:ElementRef;
@ViewChild('loadingImage') loadingDiv:ElementRef; @ViewChild('loadingImage') loadingDiv:ElementRef;
......
ecm/Angular/ProteusECM/trunk/src/app/ecm-product-details/ecm-template/ecm-handicraft.component.css
View file @ 9dead783
...@@ -252,3 +252,70 @@ td { ...@@ -252,3 +252,70 @@ td {
width: 100%; width: 100%;
} }
} }
.attribute-button{
color: mediumvioletred;
background-color: white;
width: 40px;
height: 40px;
min-width: 40px;
padding: 0;
margin: 0;
line-height: 40px;
border-radius: 100%;
}
.attribute-button .mat-button-ripple {
border-radius: 100% !important;
}
.highlight {
color: white;
background-color: mediumvioletred;
cursor: auto;
}
.selected {
box-shadow: inset 0 0 1px 1px mediumvioletred;
cursor: auto;
}
.color-title {
color: mediumvioletred;
font-size: 1rem;
position: relative;
display: inline-block;
height: 100px;
line-height: 100px;
float: left;
margin: 0;
padding: 0;
}
.size-title {
color: mediumvioletred;
font-size: 1rem;
position: relative;
display: inline-block;
height: 40px;
line-height: 40px;
float: left;
margin: 0;
padding: 0;
}
.size-variant {
margin-left: 15px;
cursor: pointer;
display: inline-block;
}
.color-variant {
margin-left: 15px;
padding: 0;
height: 100px;
width: 100px;
position: relative;
display: inline-block;
cursor: pointer;
}
ecm/Angular/ProteusECM/trunk/src/app/ecm-product-details/ecm-template/ecm-handicraft.component.html
View file @ 9dead783
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</div> </div>
<span style="display: block; color: mediumvioletred; font-size: 14px; font-weight: bold;" > Stone Handicraft </span> <span style="display: block; color: mediumvioletred; font-size: 14px; font-weight: bold;" > Stone Handicraft </span>
<span style="display: block; font-size: 20px; font-weight:bold;"> {{itemDetail.itemShDescr}} </span> <span style="display: block; font-size: 20px; font-weight:bold;"> {{itemDetail.itemHeader.itemShDescr}} </span>
<span style="display: inline; color: #888; font-size: 15px; font-weight:bold;" > Sold by </span> <span style="display: inline; color: #888; font-size: 15px; font-weight:bold;" > Sold by </span>
<span style="display: inline; color: mediumvioletred; font-size: 15px; font-weight:bold;" > StoneCraft </span><br> <span style="display: inline; color: mediumvioletred; font-size: 15px; font-weight:bold;" > StoneCraft </span><br>
...@@ -36,27 +36,24 @@ ...@@ -36,27 +36,24 @@
</span> </span>
</span> </span>
<span style="display:inline; padding-left: 10px; font-size: 14px;color: black;">{{ itemDetail.itemNumOfReviews}} Rating</span> <span style="display:inline; padding-left: 10px; font-size: 14px;color: black;">{{ itemDetail.itemRatings.NO_OF_REVIEWS}} Rating</span>
<span style="display:inline; padding-left: 5px; font-size: 14px; color: #888;" class="line"> | </span> <span style="display:inline; padding-left: 5px; font-size: 14px; color: #888;" class="line"> | </span>
<span style="display:inline; padding-left: 5px; font-size: 14px;color: black;">{{ itemDetail.itemAvgRating}} Reviews</span> <span style="display:inline; padding-left: 5px; font-size: 14px;color: black;">{{ itemDetail.itemRatings.AVG_RATING}} Reviews</span>
</a> </a>
<div style="padding-top: 20px;"> <div style="padding-top: 20px;">
<span style="font-size: 25px; font-weight:bold;"> <span style="font-size: 25px; font-weight:bold;">
Rs. {{itemDetail.itemDiscountedRate}} Rs. {{itemDetail.itemHeader.itemDiscountedRate}}
</span> </span>
</div> </div>
<span style="font-size: 15px; color: gray; font-weight: 100;"> <span style="font-size: 15px; color: gray; font-weight: 100;">
<s>Rs. {{itemDetail.itemCostRate}}</s> <s>Rs. {{itemDetail.itemHeader.itemCostRate}}</s>
</span> </span>
<span style="padding-left: 10px; color: forestgreen; font-weight:bold; font-size: 15px;"> <span style="padding-left: 10px; color: forestgreen; font-weight:bold; font-size: 15px;">
{{itemDetail.itemDiscount}}% off {{itemDetail.itemHeader.itemDiscount}}% off
</span> </span>
<br> <br>
<span style="display: inline; font-size: 16px;">
{{itemDetail.itemDetailData.itemExtraInfo}}
</span>
<button type="button" onclick="()" class="md-button link_button" >More Offers <button type="button" onclick="()" class="md-button link_button" >More Offers
<i class="material-icons arrow ">&#xE313;</i> <i class="material-icons arrow ">&#xE313;</i>
</button> </button>
...@@ -67,10 +64,10 @@ ...@@ -67,10 +64,10 @@
</div> </div>
<div class="medium-9 columns Available" style="font-size: 15px;"> <div class="medium-9 columns Available" style="font-size: 15px;">
<ul> <ul>
<li>Material: White Stone</li> <li>Material: {{itemDetail.itemDetail1.shortDetails.material}}</li>
<li>Hand Crafted</li> <li>Crafted By: {{itemDetail.itemDetail1.shortDetails.craftedBy}}</li>
<li>Pattern: Printed</li> <li>Pattern: {{itemDetail.itemDetail1.shortDetails.pattern}}</li>
<li>Short Sleeve</li> <li>{{itemDetail.itemDetail1.shortDetails.type}}</li>
</ul> </ul>
<button type="button" onclick="()" class="md-button link_button">View More</button> <button type="button" onclick="()" class="md-button link_button">View More</button>
</div> </div>
...@@ -85,7 +82,7 @@ ...@@ -85,7 +82,7 @@
<span style="display:inline; color: forestgreen; font-weight:bold; "> <span style="display:inline; color: forestgreen; font-weight:bold; ">
Available Available
</span> </span>
at 400086 at {{itemDetail.itemDetail1.location}}
<button type="button" onclick="()" class="md-button link_changebutton">Change <button type="button" onclick="()" class="md-button link_changebutton">Change
<i class="material-icons arrow">&#xE313;</i> <i class="material-icons arrow">&#xE313;</i>
</button> </button>
...@@ -116,22 +113,29 @@ ...@@ -116,22 +113,29 @@
</div> </div>
</div> </div>
<div>
<span style="display: inline; color: mediumvioletred; font-size: 14px; font-weight: bold;" > Size </span> <div *ngFor="let itemVariant of itemDetail.itemVariants">
<div class="size" style="padding-left: 10px; display: inline;">
<button md-mini-fab class="back_selected btn"> S</button> <div *ngIf="itemVariant.variant">
<button md-mini-fab class="back_selected btn" >M</button> <div *ngIf="itemVariant.attribCode == 'SIZE' ">
<button md-mini-fab class="back btn selected" >L</button> <span class = "size-title"> Size </span>
<!-- <button type="button" class="btn" onclick="()">S</button> <div *ngFor="let variant of itemVariant.variants" class="size-variant">
<button type="button" class="btn" onclick="()">M</button>
<button type="button" class="btn_selected" onclick="()">L</button> --> <a [ngClass]="{highlight:variant.itemCode == itemDetail.itemCode}" md-raised-button class="attribute-button" (click)="viewItem(variant.itemCode)"> {{variant.value}} </a>
</div> </div>
<button type="button" onclick="()" class=" md-button link_button_size " >Size Chart
<button type="button" onclick="()" class=" md-button link_button_size " >Size Chart <i class="material-icons arrow">&#xE313;</i>
<i class="material-icons arrow">&#xE313;</i> </button>
</button> </div>
<div *ngIf="itemVariant.attribCode == 'COLOR' ">
<span class = "color-title"> Color </span>
<div *ngFor="let variant of itemVariant.variants" class="color-variant" [ngClass]="{selected:variant.itemCode == itemDetail.itemCode}" (click)="viewItem(variant.itemCode)">
<ecm-image [isThumbnail]="true" [refId]='variant.itemCode' [refSer]="'M-ITEM'" [object]="'ITEM'" [isSingleImage] = "true" ></ecm-image>
</div>
</div>
</div> </div>
</div>
</div> </div>
</md-card-content> </md-card-content>
<md-card-actions> <md-card-actions>
...@@ -166,7 +170,7 @@ ...@@ -166,7 +170,7 @@
<div class="ecm-Overview"> <div class="ecm-Overview">
<span class="ecm-other-title">Overview</span> <span class="ecm-other-title">Overview</span>
<span class="ecm-other-detail"> <span class="ecm-other-detail">
<ecm-readmore [text]="itemDetailpath.productOverview" [maxLength]="120"></ecm-readmore> <ecm-readmore [text]="itemDetail.itemDetail2.productOverview" [maxLength]="120"></ecm-readmore>
</span> </span>
</div> </div>
...@@ -174,42 +178,42 @@ ...@@ -174,42 +178,42 @@
<span class="attraction">Description</span> <span class="attraction">Description</span>
<div class="data"> <div class="data">
<span class="data-title">Brand</span> <span class="data-title">Brand</span>
<span class="data-title-detail"> {{itemDetailpath.productDetails.brand}}</span> <span class="data-title-detail"> {{itemDetail.itemDetail2.productDetails.brand}}</span>
</div> </div>
<div class="data"> <div class="data">
<span class="data-title">Sku</span> <span class="data-title">Sku</span>
<span class="data-title-detail">{{itemDetailpath.productDetails.sku}}</span> <span class="data-title-detail">{{itemDetail.itemDetail2.productDetails.sku}}</span>
</div> </div>
<div class="data"> <div class="data">
<span class="data-title">Type</span> <span class="data-title">Type</span>
<span class="data-title-detail"> {{itemDetailpath.productDetails.type}}</span> <span class="data-title-detail"> {{itemDetail.itemDetail2.productDetails.type}}</span>
</div> </div>
<div class="data"> <div class="data">
<span class="data-title">Size</span> <span class="data-title">Size</span>
<span class="data-title-detail">{{itemDetailpath.productDetails.size}}</span> <span class="data-title-detail">{{itemDetail.itemDetail2.productDetails.size}}</span>
</div> </div>
<div class="data"> <div class="data" >
<span class="data-title">Weight</span> <span class="data-title">Weight</span>
<span class="data-title-detail"> {{itemDetailpath.productDetails.weight}}</span> <span class="data-title-detail"> {{itemDetail.itemDetail2.productDetails.weight}}</span>
</div> </div>
<div class="data"> <div class="data">
<span class="data-title">Material</span> <span class="data-title">Material</span>
<span class="data-title-detail"> {{itemDetailpath.productDetails.material}}</span> <span class="data-title-detail"> {{itemDetail.itemDetail2.productDetails.material}}</span>
</div> </div>
<div class="data"> <div class="data">
<span class="data-title">Color</span> <span class="data-title">Color</span>
<span class="data-title-detail">{{itemDetailpath.productDetails.color}}</span> <span class="data-title-detail">{{itemDetail.itemDetail2.productDetails.color}}</span>
</div> </div>
<div class="data"> <div class="data">
<span class="data-title">PackageContent</span> <span class="data-title">PackageContent</span>
<span class="data-title-detail">{{itemDetailpath.productDetails.packageContent}}</span> <span class="data-title-detail">{{itemDetail.itemDetail2.productDetails.packageContent}}</span>
</div> </div>
<div class="data"> <div class="data">
<span class="data-title">Care</span> <span class="data-title">Care</span>
<span class="data-title-detail">{{itemDetailpath.productDetails.care}}</span> <span class="data-title-detail">{{itemDetail.itemDetail2.productDetails.care}}</span>
</div> </div>
</div> </div>
<!-- <div *ngIf="allProductDetail" class="Attraction" style="padding-top: 24px;"> <!-- <div *ngIf="allProductDetail" class="Attraction" style="padding-top: 24px;">
<span class="attraction">Activities</span> <span class="attraction">Activities</span>
...@@ -227,12 +231,12 @@ ...@@ -227,12 +231,12 @@
<div class="ecm-returnsPolicy"> <div class="ecm-returnsPolicy">
<span class="ecm-other-title">Return Policy</span> <span class="ecm-other-title">Return Policy</span>
<span class="ecm-other-detail">{{itemDetailpath.returnPolicy}}</span> <span class="ecm-other-detail">{{itemDetail.itemDetail2.returnPolicy}}</span>
</div> </div>
<div class="ecm-termsCondition"> <div class="ecm-termsCondition">
<span class="ecm-other-title">Terms and Conditions</span> <span class="ecm-other-title">Terms and Conditions</span>
<span class="ecm-other-detail">{{itemDetailpath.termsAndCondition}}</span> <span class="ecm-other-detail">{{itemDetail.itemDetail2.termsAndCondition}}</span>
</div> </div>
</md-card> </md-card>
......
ecm/Angular/ProteusECM/trunk/src/app/ecm-product-details/ecm-template/ecm-handicraft.component.ts
View file @ 9dead783
...@@ -19,17 +19,11 @@ export class EcmHandicraftComponent implements OnInit, EcmTemplateInterface { ...@@ -19,17 +19,11 @@ export class EcmHandicraftComponent implements OnInit, EcmTemplateInterface {
@Output() scrollToReviews = new EventEmitter(); @Output() scrollToReviews = new EventEmitter();
@Output() doActivity = new EventEmitter(); @Output() doActivity = new EventEmitter();
@ViewChild( 'recentView' ) recentView: EcmRecentViewComponent; @ViewChild( 'recentView' ) recentView: EcmRecentViewComponent;
itemCode;
//isCartItem = false; //isCartItem = false;
//@Input() itemData: Item; //@Input() itemData: Item;
userActionUrl = '/ecm/service/feeds/cart'; userActionUrl = '/ecm/service/feeds/cart';
itemCode;
myCity;
Item;
itemData;
allProductDetail;
itemDetailpath;
Overview = "Champions Yacht Club specializes in offering luxury boating and yachting experiences in Goa with a large fleet of Catamarans, Boats, Cruisers & Yachts in Goa. We do Rocking birthday parties, anniversary bashes, island excursions & barbeques, fishing expeditions, snorkeling, corporate parties and more. We ensure you have a luxury experience in yachts that will leave a memory of a lifetime"; Overview = "Champions Yacht Club specializes in offering luxury boating and yachting experiences in Goa with a large fleet of Catamarans, Boats, Cruisers & Yachts in Goa. We do Rocking birthday parties, anniversary bashes, island excursions & barbeques, fishing expeditions, snorkeling, corporate parties and more. We ensure you have a luxury experience in yachts that will leave a memory of a lifetime";
...@@ -37,19 +31,12 @@ export class EcmHandicraftComponent implements OnInit, EcmTemplateInterface { ...@@ -37,19 +31,12 @@ export class EcmHandicraftComponent implements OnInit, EcmTemplateInterface {
ngOnInit() { ngOnInit() {
this.itemData = JSON.stringify( this.itemDetail ); console.log( "Item data in handicraft " + JSON.stringify(this.itemDetail) );
console.log( "Item data in handicraft " + this.itemData );
console.log( "ngOnInit EcmHandicraftComponent Object Keys : " + Object.keys( this.itemDetail ) ) console.log( "ngOnInit EcmHandicraftComponent Object Keys : " + Object.keys( this.itemDetail ) )
console.log( this.itemDetail ); console.log( this.itemDetail );
this.route.params.subscribe( params => { this.route.params.subscribe( params => {
this.itemCode = params['key']; this.itemCode = params['key'];
}); });
this.allProductDetail = this.itemDetail.itemDetailData.itemDetail2.allProductDetail;
this.itemDetailpath = this.itemDetail.itemDetailData.itemDetail2
console.log( "Product Details 2" + JSON.stringify( this.allProductDetail ) );
this.myCity = localStorage.getItem( 'mycity' );
} }
ngAfterViewInit() { ngAfterViewInit() {
...@@ -68,7 +55,12 @@ export class EcmHandicraftComponent implements OnInit, EcmTemplateInterface { ...@@ -68,7 +55,12 @@ export class EcmHandicraftComponent implements OnInit, EcmTemplateInterface {
} }
return rating; return rating;
} }
viewItem(itemCode){
// this.recentviewService.storeRecentViewItem(this.itemData.itemCode);
this.router.navigate(['/detail',itemCode]);
}
} }
......
ecm/Angular/ProteusECM/trunk/src/app/ecm-search/ecm-search.component.ts
View file @ 9dead783
import { Component, OnInit,ViewChild,ElementRef, Input, trigger, state, animate, transition, style,Injectable } from '@angular/core'; import { Component, OnInit,ViewChild, ElementRef, Input, trigger, state, animate, transition, style, Injectable } from '@angular/core';
import { EventEmitter } from '@angular/core'; import { EventEmitter } from '@angular/core';
import { EcmLocation } from './ecm-location'; import { EcmLocation } from './ecm-location';
import { EcmLocationService } from './ecm-location.service'; import { EcmLocationService } from './ecm-location.service';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment