Commit e784531b4acd9ca23398b77fdec8212a504b4356

Authored by Administrator
2 parents e0d13087 366f081e

Merge branch 'master' of gitlab.artweb.com.ua:root/maps-admin

src/app/data/data.component.html
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <md-icon md-list-icon>star</md-icon> 26 <md-icon md-list-icon>star</md-icon>
27 Прив'язки населених пунктів 27 Прив'язки населених пунктів
28 </a> 28 </a>
29 - <a md-list-item md-ripple class="block relative" (click)="!media.query('gt-sm') && manageList.close()" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}" [routerLink]="['/product']"> 29 + <a md-list-item md-ripple class="block relative" (click)="!media.query('gt-sm') && manageList.close()" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}" [routerLink]="['flow-intensity']">
30 <md-icon md-list-icon>dashboard</md-icon> 30 <md-icon md-list-icon>dashboard</md-icon>
31 Інтенсивності 31 Інтенсивності
32 </a> 32 </a>
src/services/road.service.ts
@@ -15,7 +15,7 @@ export class RoadService extends StatementBaseService { @@ -15,7 +15,7 @@ export class RoadService extends StatementBaseService {
15 return new Road(); 15 return new Road();
16 } 16 }
17 protected parseModels(json: any): any[] { 17 protected parseModels(json: any): any[] {
18 - return json.busStopEditDsM as Road[]; 18 + return json.roadEditDsM as Road[];
19 }; 19 };
20 protected parseModel(json: any): any { 20 protected parseModel(json: any): any {
21 return json as Road; 21 return json as Road;
src/services/statement.base.service.ts
@@ -105,7 +105,7 @@ export abstract class StatementBaseService { @@ -105,7 +105,7 @@ export abstract class StatementBaseService {
105 default: 105 default:
106 } 106 }
107 if (symbol.length) { 107 if (symbol.length) {
108 - result += property + symbol + value + ';'; 108 + result += symbol + property + '_' + value + ';';
109 } 109 }
110 } 110 }
111 if (result.length) { 111 if (result.length) {