diff --git a/src/client/components/TeacherProfile.js b/src/client/components/TeacherProfile.js index 0bbca709..09d35eef 100644 --- a/src/client/components/TeacherProfile.js +++ b/src/client/components/TeacherProfile.js @@ -1,3 +1,4 @@ +import {splitName} from '../../models/collective'; import template from '../../templates/components/teacher-profile.html'; export default function (app) { @@ -5,6 +6,15 @@ export default function (app) { bindings: { member: '=' }, - template: template + template: template, + controller: function($sce){ + let [first, middle, last] = splitName(this.member.name); + this.firstName = first; + this.middleName = middle; + this.lastName = last; + + if (this.member.picture) this.image = this.member.picture.big.url; + this.biography = $sce.trustAsHtml(this.member.biography); + } }); }; diff --git a/src/client/controllers/CollectiveController.js b/src/client/controllers/CollectiveController.js index e60301c4..67224ce1 100644 --- a/src/client/controllers/CollectiveController.js +++ b/src/client/controllers/CollectiveController.js @@ -1,13 +1,12 @@ -import {splitName} from '../../models/collective'; import {collectiveSortPattern} from '../config'; export default function (app) { app.controller('CollectiveController', ($scope, api) => { api.collective.list(collectiveSortPattern) .success(collective => { - $scope.members = collective.map(person => { - if (person.picture) person.image = person.picture.big.url; - person.names = splitName(person.name); + $scope.members = collective; + collective.map(person => { + return person; }); }); diff --git a/src/templates/components/teacher-profile.html b/src/templates/components/teacher-profile.html index 35efd6c7..65eec310 100644 --- a/src/templates/components/teacher-profile.html +++ b/src/templates/components/teacher-profile.html @@ -2,11 +2,11 @@
- +
-

{{$ctrl.member.names[1]}} {{$ctrl.member.names[2]}} {{$ctrl.member.names[3]}}

+

{{$ctrl.firstName}} {{$ctrl.middleName}} {{$ctrl.lastName}}

{{$ctrl.member.position}}

{{$ctrl.member.status}}

@@ -14,5 +14,7 @@

{{$ctrl.member.edu}}

Диплом {{$ctrl.member.diploma}}

+ +
\ No newline at end of file