Fixed sorting for complex fields Department and Address.

Author: ARyaskov

web/order_by_pipe.dart

@@ -1,4 +1,5 @@
 import 'dart:mirrors';
+import 'common.dart';
 import 'package:angular2/core.dart';
 import 'smart_table_record.dart';
 
@@ -16,25 +17,9 @@ class OrderByPipe implements PipeTransform {
 
  List<SmartTableRecord> transform(List<SmartTableRecord> array, String columnName, String order) {
  if (columnName.isNotEmpty && order.isNotEmpty) {
- bool isColumnExists = false;
- Symbol simpleNameAsSymbol;
- ClassMirror classMirror = reflectClass(SmartTableRecord);
- for (DeclarationMirror m in classMirror.declarations.values) {
- simpleNameAsSymbol = m.simpleName;
- String simpleName = MirrorSystem.getName(m.simpleName);
- if (columnName.compareTo(simpleName) == 0) {
- isColumnExists = true;
- break;
- }
- }
- if (isColumnExists) {
  array.sort((SmartTableRecord a, SmartTableRecord b) {
- var value1 = reflect(a)
- .getField(simpleNameAsSymbol)
- .reflectee;
- var value2 = reflect(b)
- .getField(simpleNameAsSymbol)
- .reflectee;
+ var value1 = getProperty(a, columnName).reflectee;
+ var value2 = getProperty(b, columnName).reflectee;
  if (value1 is Comparable != true) {
  value1 = value1.toString();
  value2 = value2.toString();
@@ -47,7 +32,6 @@ class OrderByPipe implements PipeTransform {
  return 0;
  }
  });
- }
  }
  return array;
  }

web/sample_data.dart

@@ -8,7 +8,7 @@ List<SmartTableRecord> sampleRecords = new List(15);
 void fillSampleData() {
  sampleRecords[0] = new SmartTableRecord(
  'Shaun', 30, Sex.male(), new Department('Australia dept.'),
- new Address("Сanberra", "Downing str.", '10b'));
+ new Address("Canberra", "Downing str.", '10b'));
 
  sampleRecords[1] = new SmartTableRecord(
  'Viki', 23, Sex.female(), new Department('Slovakia dept.'),

web/smart_table_component.html

@@ -1 +1 @@
-<div class="stc-table-div"><table class="stc-table"> <th>Имя <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('name', 'des')">&#x25B2;</a> <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('name', 'asc')">&#x25BC;</a> </th> <th>Возраст <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('age', 'des')">&#x25B2;</a> <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('age', 'asc')">&#x25BC;</a> </th> <th>Пол <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('sex', 'des')">&#x25B2;</a> <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('sex', 'asc')">&#x25BC;</a> </th> <th>Департамент <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('department.name', 'des')">&#x25B2;</a> <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('department.name', 'asc')">&#x25BC;</a> </th> <th>Адрес <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('address.city', 'des')">&#x25B2;</a> <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('address.city', 'asc')">&#x25BC;</a> </th> <tr *ngFor="#record of (getFilteredRecords() | orderBy:sortColumnName:sortColumnOrder )"> <td>{{record.name}}</td> <td>{{record.age}}</td> <td>{{record.sex.getValue()}}</td> <td>{{record.department.name}}</td> <td>{{record.address.city}}, {{record.address.street}} {{record.address.building}}</td> </tr> <tr></table></div><div class="stc-filters"> <div class="stc-filter {{filter.name}}" *ngFor="#filter of filters.values"> <h3>{{filter.title}}</h3> <table class="stc-filter-table"> <tr *ngFor="#filterKey of filter.getValuesAndCounts().keys"> <td><input name="{{filter.classFieldName}}" value="{{filterKey}}" type="checkbox" [checked]="filter.isChecked(filterKey)" [disabled]="filter.isDisabled(filterKey)" (click)="filter.onFilterValueClicked(filterKey)"/> </td> <td>{{filterKey}} ({{filter.getValuesAndCounts()[filterKey]}})</td> </tr> <tr> <td></td><td><a href="javascript:void(0)" (click)="filter.clear()" *ngIf="filter.canBeCleared()"><span>Очистить фильтр</span></a></td> </tr> </table> </div></div>
+<div class="stc-table-div"><table class="stc-table"> <th>Имя <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('name', 'des')">&#x25B2;</a> <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('name', 'asc')">&#x25BC;</a> </th> <th>Возраст <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('age', 'des')">&#x25B2;</a> <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('age', 'asc')">&#x25BC;</a> </th> <th>Пол <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('sex', 'des')">&#x25B2;</a> <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('sex', 'asc')">&#x25BC;</a> </th> <th>Департамент <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('department.name', 'des')">&#x25B2;</a> <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('department.name', 'asc')">&#x25BC;</a> </th> <th>Адрес <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('address', 'des')">&#x25B2;</a> <a class="sort-arrow" href="javascript:void(0)" (click)="onSortNameOrderChanged('address', 'asc')">&#x25BC;</a> </th> <tr *ngFor="#record of (getFilteredRecords() | orderBy:sortColumnName:sortColumnOrder )"> <td>{{record.name}}</td> <td>{{record.age}}</td> <td>{{record.sex.getValue()}}</td> <td>{{record.department.name}}</td> <td>{{record.address.city}}, {{record.address.street}} {{record.address.building}}</td> </tr> <tr></table></div><div class="stc-filters"> <div class="stc-filter {{filter.name}}" *ngFor="#filter of filters.values"> <h3>{{filter.title}}</h3> <table class="stc-filter-table"> <tr *ngFor="#filterKey of filter.getValuesAndCounts().keys"> <td><input name="{{filter.classFieldName}}" value="{{filterKey}}" type="checkbox" [checked]="filter.isChecked(filterKey)" [disabled]="filter.isDisabled(filterKey)" (click)="filter.onFilterValueClicked(filterKey)"/> </td> <td>{{filterKey}} ({{filter.getValuesAndCounts()[filterKey]}})</td> </tr> <tr> <td></td><td><a href="javascript:void(0)" (click)="filter.clear()" *ngIf="filter.canBeCleared()"><span>Очистить фильтр</span></a></td> </tr> </table> </div></div>