Skip to content

Commit 9bb7a57

Browse files
Merge pull request #261 from sunbird-cb/KB-5598-user-pagination
KB-5598 user pagination implementation
2 parents 5226885 + ddb17b2 commit 9bb7a57

File tree

5 files changed

+281
-145
lines changed

5 files changed

+281
-145
lines changed

project/ws/app/src/lib/routes/home/routes/request/all-request/all-request.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@ export class AllRequestComponent implements OnInit {
163163

164164
}
165165

166-
getPointerEventsStyle(element:any){
166+
getPointerEventsStyle(element: any) {
167167
return {
168-
'pointer-events': (element.status !== this.statusKey.Inprogress &&
169-
element.status !== this.statusKey.invalid &&
168+
'pointer-events': (element.status !== this.statusKey.Inprogress &&
169+
element.status !== this.statusKey.invalid &&
170170
element.status !== this.statusKey.fullfill) ? 'auto' : 'none',
171-
171+
172172
}
173173
}
174174

project/ws/app/src/lib/routes/home/routes/request/request-copy-details/request-copy-details.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,12 @@ export class RequestCopyDetailsComponent implements OnInit {
159159

160160
this.selectRequestType(this.requestObjData.requestType)
161161
if (this.filteredRequestType) {
162-
if(this.requestObjData.preferredProvider && this.requestObjData.preferredProvider.length){
162+
if (this.requestObjData.preferredProvider && this.requestObjData.preferredProvider.length) {
163163
const prefferedData = this.filteredRequestType.filter(option =>
164164
this.requestObjData.preferredProvider.some((res: any) =>
165165
res.providerId === option.id
166166
))
167-
if(prefferedData && prefferedData.length){
167+
if (prefferedData && prefferedData.length) {
168168
this.requestForm.controls['providers'].setValue(prefferedData)
169169
}
170170
}
@@ -187,7 +187,6 @@ export class RequestCopyDetailsComponent implements OnInit {
187187
this.router.navigateByUrl('/app/home/all-request')
188188
}
189189

190-
191190
valuechangeFuctions() {
192191
if (this.requestForm.controls['providerText']) {
193192
this.requestForm.controls['providerText'].valueChanges.pipe(

project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,16 @@
2121
</div>
2222
</div>
2323
<ng-container>
24-
<ws-widget-ui-user-table [tableData]='tabledata' [data]='data' isUpload=true isCreate=true
24+
<!-- <ws-widget-ui-user-table [tableData]='tabledata' [data]='data' isUpload=true isCreate=true
2525
[currentTabData]='currentFilter' [needCreateUser]="true" (eOnCreateClick)="onCreateClick()"
2626
(searchByEnterKey)="onEnterkySearch($event)" (actionsClick)="menuActions($event)">
27-
</ws-widget-ui-user-table>
27+
</ws-widget-ui-user-table> -->
28+
29+
<ws-widget-org-user-table-v2 [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
30+
(eOnCreateClick)="onCreateClick()" (actionsClick)="menuActions($event)"
31+
(searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
32+
[showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
33+
</ws-widget-org-user-table-v2>
2834
</ng-container>
2935
</mat-card-content>
3036
</mat-card>

0 commit comments

Comments
 (0)