Ignore:
Timestamp:
07/31/20 21:01:19 (2 years ago)
Author:
DimitarSlezenkovski <dslezenkovski@…>
Branches:
master
Children:
c406ae5
Parents:
58fa654 (diff), c73269d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://develop.finki.ukim.mk/git/farmatiko

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Farmatiko/ClientApp/src/app/counter/counter.component.html

    r58fa654 ra6bbad1  
    1010    <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Пронајди установа">
    1111  </mat-form-field>
    12     </div>
    13     <table [dataSource]="dataSource" mat-table matSort class="mat-elevation-z8">
     12    </div>   
     13  <table [dataSource]="dataSource" mat-table matSort class="mat-elevation-z8">
     14      <ng-container matColumnDef="id">
     15        <th mat-header-cell *matHeaderCellDef mat-sort-header> id </th>
     16        <td mat-cell *matCellDef="let facilities"> {{facilities.id}} </td>
     17      </ng-container>
     18
     19      <ng-container matColumnDef="createdOn">
     20        <th mat-header-cell *matHeaderCellDef mat-sort-header> createdOn </th>
     21        <td mat-cell *matCellDef="let facilities"> {{facilities.createdOn}} </td>
     22      </ng-container>
     23     
     24      <ng-container matColumnDef="deletedOn">
     25        <th mat-header-cell *matHeaderCellDef mat-sort-header> deletedOn </th>
     26        <td mat-cell *matCellDef="let facilities"> {{facilities.deletedOn}} </td>
     27      </ng-container>
     28
    1429      <ng-container matColumnDef="Име">
    1530        <th mat-header-cell *matHeaderCellDef mat-sort-header> Име </th>
     
    4560        <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
    4661    </table>
    47     <mat-paginator #paginator [pageSize]="5" [pageSizeOptions]="[5, 10, 20, 100]"></mat-paginator>
     62    <mat-paginator #paginator [pageSize]="100" [pageSizeOptions]="[5, 10, 20, 100]"></mat-paginator>
    4863  </div>
    4964  </mat-tab>
Note: See TracChangeset for help on using the changeset viewer.