Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI changes : ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-10-25 12:38:02 +05:30
parent 994d6ffa9b
commit 7924e7535c
15 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html
View File

@ -119,7 +119,7 @@
</mat-cell>
</ng-container> -->
<button mat-icon-button color="primary" class="hover-icon" matTooltip="Save Data" matTooltipPosition="above" (click)="SaveData(dataSource)"><mat-icon>save</mat-icon></button>
<!-- <button mat-icon-button color="primary" class="hover-icon" matTooltip="Save Data" matTooltipPosition="above" (click)="SaveData(dataSource)"><mat-icon>save</mat-icon></button> -->
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
</mat-table>

16
ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.html
View File

@ -2,10 +2,10 @@
<form [formGroup]="_pdTeamForm" (submit)="onSubmit()">
<mat-card style="padding: 6px;">
<div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 50%;">PD TEAM</h2>
<h2 mat-dialog-title style="width: 50%;">Add New PD Team</h2>
<div style="width: 20%;"></div>
<div style="width: 30%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()" [color]="color"><mat-icon>close</mat-icon></button>
</div>
</div>
@ -36,9 +36,9 @@
<mat-error *ngIf="!_pdTeamForm.controls['fk_city'].valid && _pdTeamForm.controls['fk_city'].touched" class="mat-text-warn">City Name Requried.</mat-error>
</mat-form-field>
<span fxFlex="0 1 auto" class="ml-xs">
<h6 *ngIf="selectedCityDatas.length != 0"> The Selected Cities are., </h6>
<h6 *ngIf="selectedCityDatas.length != 0"> The Selected Cities are </h6>
<ul *ngFor="let data of selectedCityDatas">
<!-- <h6> The Selected Cities are., </h6> -->
<!-- <h6> The Selected Cities are </h6> -->
<li>{{data}}</li>
</ul>
</span>
@ -56,9 +56,9 @@
<mat-error *ngIf="!_pdTeamForm.controls['fk_product'].valid && _pdTeamForm.controls['fk_product'].touched" class="mat-text-warn">Product Name Requried.</mat-error>
</mat-form-field>
<span fxFlex="0 1 auto" class="ml-xs">
<h6 *ngIf="selectedProductDatas.length != 0"> The Selected Products are., </h6>
<h6 *ngIf="selectedProductDatas.length != 0"> The Selected Products are </h6>
<ul *ngFor="let data of selectedProductDatas">
<!-- <h6> The Selected Products are., </h6> -->
<!-- <h6> The Selected Products are </h6> -->
<li>{{data}}</li>
</ul>
</span>
@ -76,9 +76,9 @@
</mat-form-field>
<span fxFlex="0 1 auto" class="ml-xs">
<h6 *ngIf="selectedSegmentDatas.length != 0"> The Selected Customer segment are., </h6>
<h6 *ngIf="selectedSegmentDatas.length != 0"> The Selected Customer segment are </h6>
<ul *ngFor="let data of selectedSegmentDatas">
<!-- <h6> The Selected Customer segment are., </h6> -->
<!-- <h6> The Selected Customer segment are </h6> -->
<li>{{data}}</li>
</ul>
</span>

13
ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts
View File

@ -24,7 +24,6 @@ export class PdTeamAddComponent implements OnInit {
public _pdTeamForm: FormGroup;
private notifier: NotifierService;
//public submitted = false;
color = 'primary';
errorMessage:string;
@ -37,25 +36,23 @@ customerSegmentdatas: any[];
//This Type Of Array Declaration
pdTeamCityArray:any= [];
CityValidation:any= [];
//pdTeamProductArray: Array<{teamid: number, productid: number}> = [];
//pdTeamCustomerSegmentArray: Array<{teamid: number, customerid: number}> = [];
//This Type Of Array Declaration for Local Purpose and List the data in html page
selectedCityDatas : any=[];
selectedProductDatas : any=[];
selectedSegmentDatas : any=[];
constructor(private _formBuilder: FormBuilder,
notifier: NotifierService,
private _notifier: NotifierService,
private _pdTeamService: PdTeamService,
private _router: Router,
private _masterService: MastersService)
{
this.notifier = notifier;
this.notifier = _notifier;
}
ngOnInit() {
//console.log(this.notifier);
this.PdTeamFormDatas();
/** For Checking City Validation datas - checking purpose - Already exists are not */
@ -146,10 +143,10 @@ onSubmit() {
this._pdTeamService.addPdTeamDetail(this._pdTeamForm.value).subscribe(
dataresult => {
if(dataresult.dataStatus == true) {
//this.notifier.notify('success', 'Record Saved Successfully.!');
this.notifier.notify('success', 'Record Saved Successfully.!');
Swal('Record Saved Successfully.!','success');
this._pdTeamForm.reset();
this._router.navigate(['/setting/pdteam/pdteamlist']);
}
else {
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');

10
ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html
View File

@ -2,11 +2,11 @@
<form [formGroup]="_pdTeamForm" (submit)="onSubmit()">
<mat-card style="padding: 6px;">
<div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 50%;">PD TEAM</h2>
<h2 mat-dialog-title style="width: 50%;">Edit PD Team</h2>
<div style="width: 20%;"></div>
<div style="width: 30%;text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> -->
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" type="button" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" type="button" (click)="onNoClick()" [color]="color"><mat-icon>close</mat-icon></button>
</div>
</div>
@ -38,7 +38,7 @@
<mat-error *ngIf="!_pdTeamForm.controls['fk_city'].valid && _pdTeamForm.controls['fk_city'].touched" class="mat-text-warn">City Name Requried.</mat-error>
</mat-form-field>
<span fxFlex="0 1 auto" class="ml-xs">
<h6 *ngIf="selectedCityDatas.length != 0"> The Selected Cities are., </h6>
<h6 *ngIf="selectedCityDatas.length != 0"> The Selected Cities are </h6>
<ul *ngFor="let data of selectedCityDatas">
<li>{{data}}</li>
@ -59,7 +59,7 @@
<mat-error *ngIf="!_pdTeamForm.controls['fk_product'].valid && _pdTeamForm.controls['fk_product'].touched" class="mat-text-warn">Product Name Requried.</mat-error>
</mat-form-field>
<span fxFlex="0 1 auto" class="ml-xs">
<h6 *ngIf="selectedProductDatas.length != 0"> The Selected Products are., </h6>
<h6 *ngIf="selectedProductDatas.length != 0"> The Selected Products are </h6>
<ul *ngFor="let data of selectedProductDatas">
<li>{{data}}</li>
@ -78,7 +78,7 @@
<mat-error *ngIf="!_pdTeamForm.controls['fk_customer_segment'].valid && _pdTeamForm.controls['fk_customer_segment'].touched" class="mat-text-warn">CustomerSegment Name Requried.</mat-error>
</mat-form-field>
<span fxFlex="0 1 auto" class="ml-xs">
<h6 *ngIf="selectedSegmentDatas.length != 0"> The Selected Customer segment are., </h6>
<h6 *ngIf="selectedSegmentDatas.length != 0"> The Selected Customer segment are </h6>
<ul *ngFor="let data of selectedSegmentDatas">
<li>{{data}}</li>

2
ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html
View File

@ -2,7 +2,7 @@
<mat-card>
<div fxLayout="row" fxLayoutAlign="start center" class="mb-1">
<div class="ml-xs mr-xs" style="width: 30%;">
<mat-card-title><span> PD Team Master</span></mat-card-title>
<mat-card-title><span> PD Team</span></mat-card-title>
</div>
</div>
<mat-card-content>

3
ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts
View File

@ -149,8 +149,11 @@ isactivePdTeam(id: number,isactive : number) {
/** For Display Tables Pagination And Sorting */
ngAfterViewInit() {
//alert('ngAfterViewInit()');
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
//alert('pagintor'+this.dataSource.paginator);
//alert('sort'+this.dataSource.sort);
}
/** For Display Tables Filtering */

3
ng6-seed/src/app/template/questions/add/add.component.html
View File

@ -57,7 +57,8 @@
</div>
</div>
</div>
<button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" (click)="addLanguage($event); false">Add More</button>
<button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" (click)="addLanguage($event); false"><mat-icon>add</mat-icon></button>
<!-- <button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" (click)="addLanguage($event); false">Add More</button> -->
<!--<a (click)="addLanguage()" style="cursor: default">Add another Answer </a>-->
</div>
</div>

3
ng6-seed/src/app/template/questions/edit/edit.component.html
View File

@ -60,7 +60,8 @@
</div>
</div>
</div>
<button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" (click)="addLanguage(null, null, null, $event); false">Add More</button>
<button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" (click)="addLanguage(null, null, null, $event); false"><mat-icon>add</mat-icon></button>
<!-- <button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" (click)="addLanguage(null, null, null, $event); false">Add More</button> -->
<!--<a (click)="addLanguage()" style="cursor: default">Add another Answer </a>-->
</div>
</div>

4
ng6-seed/src/app/template/questions/list/list.component.html
View File

@ -47,7 +47,7 @@
</div>
</div>
<div fxFlex="10%">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="editQuestion(product)"><mat-icon>edit</mat-icon></button>
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editQuestion(product)"><mat-icon>edit</mat-icon></button>
<!--<button mat-icon-button [matMenuTriggerFor]="menu">
<mat-icon>more_vert</mat-icon>
</button>
@ -79,7 +79,7 @@
</mat-card>
<mat-paginator #paginator class="mat-elevation-z1" [length]="productList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
[pageSizeOptions]="[5, 10, 25, 100]" (page)="pageEvent = $event; pageChange($event)">
[pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
</mat-paginator>
<!--<mat-card>
<div class="example-container mat-elevation-z8">

2
ng6-seed/src/app/template/questions/questions.module.ts
View File

@ -14,6 +14,7 @@ import {
MatListModule, MatMenuModule,
MatCheckboxModule
} from '@angular/material';
import { MatTooltipModule } from '@angular/material/tooltip';
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
@ -88,6 +89,7 @@ const customNotifierOptions: NotifierOptions = {
MatToolbarModule,MatSelectModule,MatListModule, MatMenuModule,
MatSlideToggleModule,
MatCheckboxModule,
MatTooltipModule,
FormsModule,
ReactiveFormsModule,
QuestionsRouting

3
ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.html
View File

@ -29,8 +29,7 @@
</div>
<div class="row" style="text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Add More Contact Person" matTooltipPosition="above" (click)="addLanguage(null, $event); false"><mat-icon>add</mat-icon></button>
<button mat-raised-button mat-icon-button color="primary" class="mr-1 mb-1 hover-icon" matTooltip="Add More Category" matTooltipPosition="above" (click)="addLanguage(null, $event); false"><mat-icon>add</mat-icon></button>
<!--<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset"><mat-icon>settings_backup_restore</mat-icon></button>-->
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
</div>

2
ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.html
View File

@ -46,7 +46,7 @@
</mat-card>
</div>
<div class="row" style="text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Add More Contact Person" matTooltipPosition="above" (click)="addLanguage(null, $event); false"><mat-icon>add</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" color="primary" matTooltip="Add More Lender Details" matTooltipPosition="above" (click)="addLanguage(null, $event); false"><mat-icon>add</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset"><mat-icon>settings_backup_restore</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>

6
ng6-seed/src/app/template/templates/templates-list/edit/edit-question-answer/category-question-answer/category-question-answer.component.html
View File

@ -21,7 +21,8 @@
</div>
</div>
<div formArrayName="answers" class="example-full-width">
<div fxLayout.xs="column" fxLayoutWrap fxLayoutGap="0.5%" fxLayoutAlign="center">
<div fxLayout="row wrap" fxLayout.xs="column" fxLayoutWrap fxLayoutGap="0.5%" fxLayoutAlign="center">
<div fxFlex.gt-xs="50%" [fxFlex.gt-md]="regularDistribution" *ngFor="let answ of ques['controls'].answers['controls']; let i_ans = index ; let Ans_last = last;">
<div [formGroupName]="i_ans">
<div fxLayout="row" fxLayout.xs="column" fxLayoutGap="0.5%" fxLayoutAlign="start center">
@ -57,8 +58,7 @@
</div>
<div class="row" style="text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Add More Contact Person" matTooltipPosition="above" (click)="openDialog(); false"><mat-icon>add</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Add More Question and Answer" matTooltipPosition="above" color="primary" (click)="openDialog(); false"><mat-icon>add</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
</div>
</form>

6
ng6-seed/src/app/template/templates/templates-list/templates.list.component.html
View File

@ -21,7 +21,7 @@
</form>-->
</div>
<div fxFlex="20%" style="text-align:right;">
<button mat-fab color="primary" (click)="addNewTemplate()" matTooltip="Add New Template" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
<button mat-fab color="primary" (click)="addNewTemplate()" matTooltip="Add Template" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
<!--<button mat-stroked-button color="primary" (click)="addNewQuestion()">Add Questions</button>-->
</div>
</div>
@ -45,7 +45,7 @@
</div>
</div>
<div fxFlex="10%">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="goToEdit(template.template_id)"><mat-icon>edit</mat-icon></button>
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="goToEdit(template.template_id)"><mat-icon>edit</mat-icon></button>
</div>
</div>
</mat-card>
@ -56,7 +56,7 @@
</mat-card>
<mat-paginator #paginator class="mat-elevation-z1" [length]="templateList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
[pageSizeOptions]="[5, 10, 25, 100]" (page)="pageEvent = $event; pageChange($event)">
[pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
</mat-paginator>
</mat-card>
</div>

2
ng6-seed/src/app/template/templates/templates.module.ts
View File

@ -15,6 +15,7 @@ import {
MatCheckboxModule, MatStepperModule, MatTabsModule,
MatExpansionModule
} from '@angular/material';
import { MatTooltipModule } from '@angular/material/tooltip';
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
@ -100,6 +101,7 @@ const customNotifierOptions: NotifierOptions = {
MatTabsModule,
MatSlideToggleModule,
MatCheckboxModule,
MatTooltipModule,
FormsModule,
ReactiveFormsModule,
TemplatesRouting