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

pd merge

Browse Source
This commit is contained in:
gandhimathi 2018-10-30 19:29:03 +05:30
commit 30d07bc1c6
16 changed files with 81 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html
View File

@ -16,20 +16,21 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Address"> <ng-container matColumnDef="Address">
<mat-cell class="cell" *matCellDef="let details;"> <mat-cell class="cell" *matCellDef="let details;">
<span>{{details.pd_date_of_initiation}}</span><br> <span matTooltip="Initiated Date" matTooltipPosition="above" >{{details.pd_date_of_initiation}}</span><br>
<span class="fontsize" *ngIf="details.city_name"> <i class="fa-1x fa fa-map-marker"> </i> {{details.city_name}}-{{details.pincode}} </span> <span class="fontsize" *ngIf="details.city_name"> <i class="fa-1x fa fa-map-marker"> </i> {{details.city_name}}-{{details.pincode}} </span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Status"> <ng-container matColumnDef="Status">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<span> {{details.pd_status}}</span><br> <span> {{details.pd_status}}</span><br>
<span class="fontsize">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} <span class="fontsize" [matTooltip]="details.pd_status | titlecase" matTooltipPosition="above" >{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span> </span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Action"> <ng-container matColumnDef="Action">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)"><mat-icon>visibility</mat-icon></button> <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)" matTooltip="View"
matTooltipPosition="above"><mat-icon>visibility</mat-icon></button>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;"> <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">

5
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts
View File

@ -82,4 +82,9 @@ export class AllPdComponent implements OnInit, OnChanges {
} }
titleCaseWord(word:string) {
if (!word) return word;
return word[0].toUpperCase() + word.substr(1).toLowerCase();
}
} }

7
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html
View File

@ -16,20 +16,21 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Address"> <ng-container matColumnDef="Address">
<mat-cell class="cell" *matCellDef="let details;"> <mat-cell class="cell" *matCellDef="let details;">
<span>{{details.pd_date_of_initiation}}</span><br> <span matTooltip="Initiated Date" matTooltipPosition="above">{{details.pd_date_of_initiation}}</span><br>
<span class="fontsize" *ngIf="details.city_name"> <i class="fa-1x fa fa-map-marker"> </i> {{details.city_name}}-{{details.pincode}} </span> <span class="fontsize" *ngIf="details.city_name"> <i class="fa-1x fa fa-map-marker"> </i> {{details.city_name}}-{{details.pincode}} </span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Status"> <ng-container matColumnDef="Status">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<span> {{details.pd_status}}</span><br> <span> {{details.pd_status}}</span><br>
<span class="fontsize">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} <span class="fontsize" [matTooltip]="details.pd_status | titlecase" >{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span> </span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Action"> <ng-container matColumnDef="Action">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)"><mat-icon>visibility</mat-icon></button> <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)" matTooltip="View"
matTooltipPosition="above" ><mat-icon>visibility</mat-icon></button>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;"> <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">

5
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts
View File

@ -80,6 +80,11 @@ export class CompletedPdComponent implements OnInit, OnChanges {
} }
titleCaseWord(word:string) {
if (!word) return word;
return word[0].toUpperCase() + word.substr(1).toLowerCase();
}
} }

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html
View File

@ -16,20 +16,20 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Address"> <ng-container matColumnDef="Address">
<mat-cell class="cell" *matCellDef="let details;"> <mat-cell class="cell" *matCellDef="let details;">
<span>{{details.pd_date_of_initiation}}</span><br> <span matTooltip="Initiated Date" matTooltipPosition="above">{{details.pd_date_of_initiation}}</span><br>
<span class="fontsize" *ngIf="details.city_name"> <i class="fa-1x fa fa-map-marker"> </i> {{details.city_name}}-{{details.pincode}} </span> <span class="fontsize" *ngIf="details.city_name"> <i class="fa-1x fa fa-map-marker"> </i> {{details.city_name}}-{{details.pincode}} </span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Status"> <ng-container matColumnDef="Status">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<span> {{details.pd_status}}</span><br> <span> {{details.pd_status}}</span><br>
<span class="fontsize">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} <span class="fontsize" [matTooltip]="details.pd_status | titlecase" matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span> </span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Action"> <ng-container matColumnDef="Action">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)"><mat-icon>visibility</mat-icon></button> <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)" matTooltip="View" matTooltipPosition="above"><mat-icon>visibility</mat-icon></button>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;"> <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts
View File

@ -77,5 +77,9 @@ export class InprogressPdComponent implements OnInit, OnChanges {
this.loadPdView.next(pdid); this.loadPdView.next(pdid);
} }
titleCaseWord(word:string) {
if (!word) return word;
return word[0].toUpperCase() + word.substr(1).toLowerCase();
}
} }

9
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html
View File

@ -17,10 +17,11 @@
<mat-card fxFlex="100%"> <mat-card fxFlex="100%">
<mat-card-content style="text-align:center"> <mat-card-content style="text-align:center">
<mat-radio-button [value]="officer" (change)="selectPdOfficer(officer)"></mat-radio-button> <mat-radio-button [value]="officer" (change)="selectPdOfficer(officer)"></mat-radio-button>
<img [src]="officer.profile_url" alt="No Image" style="border-radius:50%;width:50%"><br> <img [src]="officer.profile_url ||'https://image.ibb.co/mGjZB9/usernew.png'" alt="No Image" style="border-radius:50%;width:50%"><br>
<span matBadge="{{officer.count}}" matBadgeOverlap="false" matBadgeColor="warn">{{officer.first_name}}</span> <span>{{officer.first_name}}</span>
<br> <br>
<span>{{officer.mobile_no}}</span> <span>{{officer.mobile_no}}</span><br>
<span>PD in hand - {{officer.count}}</span>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
</div> </div>
@ -30,7 +31,7 @@
</div> </div>
<mat-list *ngIf="pdOfficerList.length == 0"> <mat-list *ngIf="pdOfficerList.length == 0">
<mat-list-item> <mat-list-item>
<p>PD officer not available..</p> <p>No PD officer available.</p>
</mat-list-item> </mat-list-item>
</mat-list> </mat-list>

8
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html
View File

@ -16,20 +16,20 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Address"> <ng-container matColumnDef="Address">
<mat-cell class="cell" *matCellDef="let details;"> <mat-cell class="cell" *matCellDef="let details;">
<span>{{details.pd_date_of_initiation}}</span><br> <span matTooltip="Initiated Date" matTooltipPosition="above">{{details.pd_date_of_initiation}}</span><br>
<span class="fontsize" *ngIf="details.city_name"> <i class="fa-1x fa fa-map-marker"> </i> {{details.city_name}}-{{details.pincode}} </span> <span class="fontsize" *ngIf="details.city_name"> <i class="fa-1x fa fa-map-marker"> </i> {{details.city_name}}-{{details.pincode}} </span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Status"> <ng-container matColumnDef="Status">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<span> {{details.pd_status}}</span><br> <span > {{details.pd_status}}</span><br>
<span class="fontsize">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} <span class="fontsize" [matTooltip]="details.pd_status | titlecase" matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span> </span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Action"> <ng-container matColumnDef="Action">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)"><mat-icon>visibility</mat-icon></button> <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)" matTooltip="View" matTooltipPosition="above"><mat-icon>visibility</mat-icon></button>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;"> <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts
View File

@ -79,6 +79,10 @@ export class QcCompletedPdComponent implements OnInit, OnChanges {
this.loadPdView.next(pdid); this.loadPdView.next(pdid);
} }
titleCaseWord(word:string) {
if (!word) return word;
return word[0].toUpperCase() + word.substr(1).toLowerCase();
}
} }

9
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
View File

@ -16,23 +16,28 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Address"> <ng-container matColumnDef="Address">
<mat-cell class="cell" *matCellDef="let details;"> <mat-cell class="cell" *matCellDef="let details;">
<span>{{details.pd_date_of_initiation}}</span><br> <span matTooltip="Initiated Date" matTooltipPosition="above">{{details.pd_date_of_initiation}}</span><br>
<span class="fontsize" *ngIf="details.city_name"> <i class="fa-1x fa fa-map-marker"> </i> {{details.city_name}}-{{details.pincode}} </span> <span class="fontsize" *ngIf="details.city_name"> <i class="fa-1x fa fa-map-marker"> </i> {{details.city_name}}-{{details.pincode}} </span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Status"> <ng-container matColumnDef="Status">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<span> {{details.pd_status}}</span><br> <span> {{details.pd_status}}</span><br>
<<<<<<< HEAD
<!-- <span class="fontsize">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} <!-- <span class="fontsize">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span> --> </span> -->
<span class="fontsize">{{details.scheduled_on}} <span class="fontsize">{{details.scheduled_on}}
</span> </span>
=======
<span class="fontsize" [matTooltip]="details.pd_status | titlecase" matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span>
>>>>>>> d0eab1030bbd496efa69a275ecc67f72ff2121d6
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Action"> <ng-container matColumnDef="Action">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)"><mat-icon>visibility</mat-icon></button> <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)" matTooltip="View" matTooltipPosition="above"><mat-icon>visibility</mat-icon></button>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;"> <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">

5
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts
View File

@ -77,6 +77,11 @@ export class ScheduledPdComponent implements OnInit, OnChanges {
this.loadPdView.next(pdid); this.loadPdView.next(pdid);
} }
titleCaseWord(word:string) {
if (!word) return word;
return word[0].toUpperCase() + word.substr(1).toLowerCase();
}
} }

33
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.html
View File

@ -31,20 +31,19 @@
<mat-card fxFlex="100%"> <mat-card fxFlex="100%">
<mat-card-content style="text-align:center"> <mat-card-content style="text-align:center">
<mat-radio-button [value]="officer" (change)="selectPdOfficer(officer)"></mat-radio-button> <mat-radio-button [value]="officer" (change)="selectPdOfficer(officer)"></mat-radio-button>
<img [src]="officer.profile_url" alt="No Image" style="border-radius:50%;width:50%"><br> <img [src]="officer.profile_url ||'https://image.ibb.co/mGjZB9/usernew.png'" alt="No Image" style="border-radius:50%;width:50%"><br>
<span matBadge="{{officer.count}}" matBadgeOverlap="false" matBadgeColor="warn">{{officer.first_name}}</span> <span>{{officer.first_name}}</span>
<br> <br>
<span>{{officer.mobile_no}}</span> <span>{{officer.mobile_no}}</span>
<span>PD in hand - {{officer.count}}</span>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
</div> </div>
</div> </div>
</div>
</div>
<mat-list *ngIf="pdOfficerList.length == 0"> <mat-list *ngIf="pdOfficerList.length == 0">
<mat-list-item> <mat-list-item>
<p>PD officer not available..</p> <p>No executive available.</p>
</mat-list-item> </mat-list-item>
</mat-list> </mat-list>
@ -63,7 +62,23 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<mat-list *ngIf="pdExcutiveList.length > 0"> <div *ngIf="pdExcutiveList.length > 0" >
<div fxLayout="row wrap" fxFlex="100%">
<div fxLayout="row wrap" fxFlex="33.33%" *ngFor="let excutive of pdExcutiveList">
<mat-card fxFlex="100%">
<mat-card-content style="text-align:center">
<mat-radio-button [value]="excutive" (change)="selectExcutiveOfficer(excutive)"></mat-radio-button>
<img [src]="excutive.profile_url ||'https://image.ibb.co/mGjZB9/usernew.png'" alt="No Image" style="border-radius:50%;width:50%"><br>
<span>{{excutive.first_name}}</span>
<br>
<span>{{excutive.mobile_no}}</span> <br>
<span>PD in hand - {{excutive.count}}</span>
</mat-card-content>
</mat-card>
</div>
</div>
</div>
<!----<mat-list *ngIf="pdExcutiveList.length > 0">
<mat-radio-group> <mat-radio-group>
<mat-list-item *ngFor="let excutive of pdExcutiveList"> <mat-list-item *ngFor="let excutive of pdExcutiveList">
<p><mat-radio-button [value]="excutive" (change)="selectExcutiveOfficer(excutive)"></mat-radio-button> <p><mat-radio-button [value]="excutive" (change)="selectExcutiveOfficer(excutive)"></mat-radio-button>
@ -81,10 +96,10 @@
</mat-list-item> </mat-list-item>
</mat-radio-group> </mat-radio-group>
</mat-list> </mat-list> -->
<mat-list *ngIf="pdExcutiveList.length == 0"> <mat-list *ngIf="pdExcutiveList.length == 0">
<mat-list-item> <mat-list-item>
<p>Excutive officer not available..</p> <p>No central officer available.</p>
</mat-list-item> </mat-list-item>
</mat-list> </mat-list>

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.ts
View File

@ -11,8 +11,8 @@ import { PdTrigerService } from '../../../pd-service/pd-triger.service';
}) })
export class SmartPdAllocationComponent implements OnInit { export class SmartPdAllocationComponent implements OnInit {
public pageTitle: string = "Allocate To PD Officer"; public pageTitle: string = "Allocate To Executive";
public pageTitle2: string = "Allocate To Excutive Officer"; public pageTitle2: string = "Allocate To Central Officer";
public _pdAllocationForm: FormGroup; public _pdAllocationForm: FormGroup;
public pdOfficerList: any = []; public pdOfficerList: any = [];
public pdExcutiveList: any = []; public pdExcutiveList: any = [];

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

@ -221,7 +221,7 @@ onChangeEntityId($event){
if(this._pdTeamForm.value['fk_city'] != null){ if(this._pdTeamForm.value['fk_city'] != null){
this.f.fk_city.setValue(null); this.f.fk_city.setValue(null);
alert(this._pdTeamForm.value['fk_city']); //alert(this._pdTeamForm.value['fk_city']);
} }
if($event.isUserInput != false){ if($event.isUserInput != false){

4
ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts
View File

@ -411,11 +411,11 @@ export class PdTeamEditComponent implements OnInit {
dataresult=>{ dataresult=>{
if (dataresult.dataStatus == true){ if (dataresult.dataStatus == true){
Swal("Data Edited Successfully"); Swal("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!'); // this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
Swal("SomeThing Wents Wrong Try Again !"); Swal("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); // this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });

2
ng6-seed/src/app/shared/menu-items/menu-items.ts
View File

@ -85,7 +85,7 @@ const MENUITEMS : Menu[] = [
state:'quality_check_discussion', state:'quality_check_discussion',
name:'Quality Check', name:'Quality Check',
type:'link', type:'link',
icon:'forum', icon:'done_all',
} }
]; ];