Skip to content

B
business-java
Commit 0d332fb2 authored by prumde's avatar prumde
Browse files
Options

Updated 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174542 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fab33a64
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 77 deletions
ecm/Angular/ProteusECM/trunk/src/app/app.component.ts
View file @ 0d332fb2
......@@ -31,6 +31,7 @@ export class AppComponent {
this.setItem('jwtToken', this.get('jwtToken'), false );
this.setItem('appstate', this.get('app_stat'), true );
this.setItem('TOKEN_ID', this.get('TOKEN_ID'), true );
this.setItem('ECM_TYPE', this.get('ECM_TYPE'), true );
this.store.dispatch(this.cartAction.loadCartItems());
this.store.dispatch(this.wishListAction.loadWishlistItems());
......
ecm/Angular/ProteusECM/trunk/src/app/app.module.ts
View file @ 0d332fb2
......@@ -83,7 +83,6 @@ import { ChangePasswordComponent } from './change-password/change-password.compo
import { MaterialModule } from './module';
import { EcmOrderComponent } from './ecm-order/ecm-order.component';
import { EcmVariantsComponent } from './ecm-view/ecm-variants/ecm-variants.component';
import { EcmOrderDetailComponent } from './ecm-order-detail/ecm-order-detail.component';
import { ECMExploreComponent } from './ecm-home/ecm-explore.component';
//Changes by Prajyot
......@@ -100,7 +99,6 @@ const appRoutes: Routes = [
{ path: 'checkout', component: EcmCheckoutComponent},
{ path: 'wishlist', component: EcmWishListComponent},
{ path: 'myOrder', component: EcmOrderComponent},
{ path: 'orderDetail', component: EcmOrderDetailComponent},
{ path: 'myprofile', component: MyProfileComponent, children: [
{ path: 'userprofile', component: UserProfileComponent, outlet: 'profile' },
{ path: 'useraddress', component: UserAddressComponent, outlet: 'profile' },
......@@ -167,7 +165,6 @@ const appRoutes: Routes = [
ReviewScreenComponent,
EcmOrderComponent,
EcmVariantsComponent,
EcmOrderDetailComponent,
ECMExploreComponent
],
imports: [
......
ecm/Angular/ProteusECM/trunk/src/app/ecm-home/ecm-home.component.html
View file @ 0d332fb2
<ecm-header> </ecm-header>
<ecm-content> </ecm-content>
<ecm-content *ngIf="clientWidth > 750"> </ecm-content>
<ecm-footer> </ecm-footer>
\ No newline at end of file
ecm/Angular/ProteusECM/trunk/src/app/ecm-home/ecm-home.component.ts
View file @ 0d332fb2
import { Component, OnInit, OnDestroy, AfterViewChecked } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { JwtHelper } from 'angular2-jwt';
import { RESIZE_EVENT } from '../ecm-store/ecm-resize';
@Component({
selector: 'ecm-home',
......@@ -9,6 +10,7 @@ import { JwtHelper } from 'angular2-jwt';
})
export class ECMHomeComponent implements OnInit, OnDestroy, AfterViewChecked {
jwtHelper: JwtHelper = new JwtHelper();
clientWidth;
constructor(private router: Router, private route: ActivatedRoute) { }
ngOnInit() {
console.log(' ECMHomeComponent ngOnInit');
......@@ -18,6 +20,10 @@ export class ECMHomeComponent implements OnInit, OnDestroy, AfterViewChecked {
if( appstateCahce !== 'undefined' && appstateCahce !== 'no-appstate' ){
this.goToLink(appstateCahce);
}
this.clientWidth = document.documentElement.clientWidth;
RESIZE_EVENT.subscribe(data => {
this.clientWidth = data;
});
}
ngAfterViewChecked() {
let appstateCahce: string = localStorage.getItem('appstate') ? localStorage.getItem('appstate') : 'no-appstate';
......
ecm/Angular/ProteusECM/trunk/src/app/ecm-order/ecm-order.component.css
View file @ 0d332fb2
......@@ -28,6 +28,7 @@
border-left: 0px;
border-right: 0px;
margin: 0px;
padding: 5px;
}
.orderList{
margin: 0px;
......
ecm/Angular/ProteusECM/trunk/src/app/ecm-order/ecm-order.component.ts
View file @ 0d332fb2
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, Input, OnChanges, DoCheck, } from '@angular/core';
import { Breadcrumbs } from '../ecm-breadcrumbs/ecm-breadcrumbs.component';
import { HostUrlService } from '../host-url.service';
import { MdSnackBar } from '@angular/material';
import { Store } from '@ngrx/store';
import { AppState } from '../ecm-store/reducers';
import { OrderActions} from '../ecm-store/actions';
import { EcmOrderService } from './ecm-order.service';
import { Observable } from 'rxjs/Observable';
import { Router, ActivatedRoute } from '@angular/router';
import { Order } from '../ecm-model/order-model';
@Component({
selector: 'app-ecm-order',
templateUrl: './ecm-order.component.html',
styleUrls: ['./ecm-order.component.css']
styleUrls: ['./ecm-order.component.css'],
providers:[EcmOrderService]
})
export class EcmOrderComponent implements OnInit {
hostUrl;
constructor(public hostUrlService : HostUrlService,public breadcrumbSerivce: Breadcrumbs) {
this.hostUrl=this.hostUrlService.hostUrl;
}
ordersList : any;
ordersItems : Observable<Order[]>;
totalPrice: number = 0;
orderDate: string;
constructor( private route: ActivatedRoute, public breadcrumbSerivce: Breadcrumbs, public snackBar: MdSnackBar, private store: Store<AppState>, private router: Router, private orderActions: OrderActions , public orderService: EcmOrderService) {}
ngOnInit() {
console.log( 'ECMOrderComponent onInit hostUrl' , this.hostUrl);
let breadcrumb = [{label: 'Home', url: '/home'}, {label: 'Orders', url: 'javascript:void(0)'}];
this.breadcrumbSerivce.breadcrumbs = breadcrumb;
this.ordersItems = this.store.select( 'orderItems' );
this.store.dispatch(this.orderActions.loadOrderItems());
this.loadOrders();
}
dispDateFormat = 'dd MMM yyyy - EEEE';
toDate( dateStr ) {
let date: Date = new Date();
//2017-11-07T00:00:00
var parts = dateStr.split( "-" );
date = new Date(parts[2], parts[1] - 1, parts[0]);
console.log("the date try", date);
if(date.toString() === 'Invalid Date'){
date = new Date(dateStr);
console.log("the date catch", date);
}
return date;
}
loadOrders() {
this.store.select( 'orderItems' ).subscribe( orderItems => {
console.log( 'loadUser orderList >> ', orderItems );
this.ordersList = orderItems;
});
}
invoiceDetail(){
this.openSnackBar( 'The Page is redirected to Invoice' );
}
orderDetail(){
this.router.navigate( ['/orderDetail'] );
}
openSnackBar( message: string ) {
this.snackBar.open( message, '', {
duration: 2000,
});
}
}
ecm/Angular/ProteusECM/trunk/src/app/user-address/ecm-user-address.service.ts
View file @ 0d332fb2
......@@ -36,7 +36,7 @@ export class UserAddressService {
let headers = new Headers( { 'Content-Type': 'application/json' });
let options = new RequestOptions( { headers: headers });
return this.http.post( '/ecm/service/feeds/address', JSON.stringify(userAdress) , options)
return this.http.post( this.hostUrlService.hostUrl+this.userActionUrl +'/address', JSON.stringify(userAdress) , options)
.map( (res) => this.extractData(res) );
}
......@@ -46,7 +46,7 @@ export class UserAddressService {
let headers = new Headers( { 'Content-Type': 'application/json' });
let options = new RequestOptions( { headers: headers });
return this.http.post( '/ecm/service/feeds/address', JSON.stringify(userAdress) , options)
return this.http.post( this.hostUrlService.hostUrl+this.userActionUrl +'/address', JSON.stringify(userAdress) , options)
.map( (res) => this.extractData(res) );
}
......@@ -59,7 +59,7 @@ export class UserAddressService {
getSuggestions(field, value) {
console.log('Query:['+field+']['+value+']');
let suggestionUrl = '/ecm/service/sys/' + field + '/' + value;
let suggestionUrl = this.hostUrlService.hostUrl+'/ecm/service/sys/' + field + '/' + value;
let headers = new Headers( { 'Content-Type': 'application/json' });
let options = new RequestOptions( { headers: headers });
......
ecm/Angular/ProteusECM/trunk/src/app/user-card/card-manager/card-screen/card-screen.component.html
View file @ 0d332fb2
......@@ -3,7 +3,7 @@
<ng-template #displayTemplate>
<div class="atm-card-img">
<img class="ecm-card-icon" src="/ecm/assets/images/{{card?.payServiceProvider.trim()}}.png" />
<img class="ecm-card-icon" src="/ibase/ecm/assets/images/{{card?.payServiceProvider.trim()}}.png" />
</div>
<div class="user-bank-info">
<div class="bname">
......
ecm/Angular/ProteusECM/trunk/src/app/user-review/review-manager/review-manager.component.css
View file @ 0d332fb2
.user-review-edit-button{
/* text-align: right; */
padding-bottom: 8px;
}
......@@ -52,11 +51,6 @@
width: calc(50% - 10px);
}
/* .user-review-card{ */
/* border: 1px solid #f2f2f2; */
/* border-top: 0px; */
/* } */
.user-review-card{
border: 1px solid #f2f2f2;
border-top: 0px;
......@@ -94,42 +88,30 @@
.wReview{
display: inline-block;
padding: 28px;
padding-left: 100px;
position: relative;
left: calc(50% - 95px);
padding-top: 48px;
}
@media screen and (max-width: 640px){
/* .user-review-edit-button{ */
/* padding-bottom: 0px !important; */
/* position: relative !important; */
/* bottom: 50px !important; */
/* float: right !important; */
/* left: 18px !important; */
/* } */
.review-card-delete-button{
padding: 0px !important;
position: relative !important;
bottom: 4px !important;
bottom: 16px !important;
float: none !important;
}
.review-edit-button{
padding: 0px !important;
position: relative !important;
bottom: 42px !important;
bottom: 54px !important;
}
.review-save-cancel-button{
padding-bottom: 30px !important;
}
/* .save-review-button { */
/* width: 127px !important; */
/* } */
/* .cancel-review-button { */
/* width: 127px !important; */
/* } */
.wReview{
padding: 0px !important;
float: right !important;
left: 0px !important;
}
.write-review-button {
width: 163px !important;
......
ecm/Angular/ProteusECM/trunk/src/app/user-review/review-manager/review-manager.component.ts
View file @ 0d332fb2
......@@ -26,7 +26,7 @@ export class ReviewEditor implements OnInit {
@Input() reviewList : Review;
@Input('isDetailPage') isDetailPage: boolean = false;
@Input() itemCode;
@Input('itemCode') itemCode;
oldReview : Review;
isNullReview: boolean = true;
......@@ -76,6 +76,7 @@ export class ReviewEditor implements OnInit {
this.onSave.emit(this.userReview);
console.log('save...');
localStorage.removeItem('editorId');
this.isNullReview = false;
this.editMode = 'V';
}
......@@ -99,6 +100,7 @@ export class ReviewEditor implements OnInit {
remove() {
this.userReviewService.removeReview(this.itemCode);
this.initializeUserReview();
this.isNullReview = true;
}
confirmDialog() {
......
ecm/Angular/ProteusECM/trunk/src/app/user-review/review-manager/review-screen/review-screen.component.html
View file @ 0d332fb2
......@@ -4,54 +4,25 @@
<ng-template #displayTemplate>
<div class="user-review-info" *ngIf="!isNullReview">
<!-- <div class="large-2 columns"> -->
<!-- <img class="ecm-product-image" src="/ibase/ecm/assets/images/items/L2D0100058.png" /> -->
<!-- </div> -->
<div>
<!-- <div> -->
<!-- <span class="category-name">{{reviewList?.itemCategory}}</span> -->
<!-- </div> -->
<div>
<rating [rate]="userReview?.productRating"></rating>
</div>
<div class="user-review-title">
<span class="review-title">{{userReview?.productRemarks}}</span>
</div>
<!-- <div class="items-seller-info"> -->
<!-- <span class="seller-info">{{reviewList?.sellerInfo}}</span> -->
<!-- </div> -->
<div class="item-review">
<!-- <span class="item-review">{{reviewList?.itemdescription}}</span> -->
<ecm-readmore *ngIf="userReview?.productComments" [text]="userReview?.productComments" [maxLength]="112"></ecm-readmore>
<ecm-readmore *ngIf="userReview?.productComments" [text]="userReview?.productComments" [maxLength]="50"></ecm-readmore>
</div>
</div>
</div>
<!-- change by Kamal -->
<!-- <div *ngIf="isNullReview && editMode == 'V'"> -->
<!-- <button md-button class="write-review-button" (click)="editMode = 'E'"> -->
<!-- <i class="material-icons edit">&#xE254;</i> -->
<!-- <span md-button class="write-review-text"> Write a Review </span> -->
<!-- </button> -->
<!-- </div> -->
</ng-template>
<ng-template #interactiveTemplate>
<div class="review-edit-information">
<!-- <div class="large-2 columns"> -->
<!-- <img class="ecm-product-image" src="/ibase/ecm/assets/images/items/L2D0100058.png" /> -->
<!-- </div> -->
<div >
<!-- <div> -->
<!-- <span class="edit-category-name">{{reviewList?.itemCategory}}</span> -->
<!-- </div> -->
<div class="user-edit-review-item-rating">
<rating [rate]="userReview.productRating" (updateRate)="updateRate($event)" [isResponsive]="true" ></rating>
</div>
......
ecm/Angular/ProteusECM/trunk/src/app/user-review/user-review.component.html
View file @ 0d332fb2
<div class="user-review-all-info">
<review-manager [id] = "'REV_1'" [editorId] = "'REV_1'" [reviewList] = "reviewList"
(onSave) = 'onSaveClick($event)'
(onDiscard) = 'onDiscard($event)' (onCancel)="onCancel.emit();" [isDetailPage]="isDetailPage" [editMode]="editMode">
(onDiscard) = 'onDiscard($event)' (onCancel)="onCancel.emit();" [isDetailPage]="isDetailPage" [itemCode]="itemCode" [editMode]="editMode">
</review-manager>
</div>
\ No newline at end of file
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