TeamController -> CollectiveController, team-member-profile -> teacher-profile; team.js -> collective.js

This commit is contained in:
tmshv committed 2016-02-24 20:58:19 +03:00
1 parent f40f164e4d
commit 8031d83f56
13 files changed
+85 -196

No files matched your search

+8 -8
View File
@@ -7,7 +7,7 @@ import Breadcrumbs from './components/Breadcrumbs';
import Document from './components/Document';
import Award from './components/Award';
import GalleryItem from './components/GalleryItem';
import TeamMemberProfile from './components/TeamMemberProfile';
import TeacherProfile from './components/TeacherProfile';
import Timeline from './components/Timeline';
import TimelineRecord from './components/TimelineRecord';
import TimelineRecordPost from './components/TimelineRecordPost';
@@ -20,7 +20,7 @@ import ScheduleRecord from './components/ScheduleRecord';
import AppController from './controllers/AppController';
import HomeController from './controllers/HomeController';
import ScheduleController from './controllers/ScheduleController';
import TeamController from './controllers/TeamController';
import CollectiveController from './controllers/CollectiveController';
import GalleryController from './controllers/GalleryController';
import AlbumController from './controllers/AlbumController';
import DocumentsController from './controllers/DocumentsController';
@@ -61,8 +61,8 @@ app.config(($locationProvider, $routeProvider) => {
},
{
name: '/collective',
templateUrl: '/views/team.html',
controller: 'TeamPageController',
templateUrl: '/views/collective.html',
controller: 'CollectivePageController',
title: 'Преподаватели'
},
{
@@ -120,11 +120,11 @@ app.run(($location, $rootScope, $http) => {
Document,
Award,
GalleryItem,
TeamMemberProfile,
TeacherProfile,
AppController,
HomeController,
ScheduleController,
TeamController,
CollectiveController,
GalleryController,
AlbumController,
DocumentsController,
@@ -156,8 +156,8 @@ app.run(($location, $rootScope, $http) => {
$scope.pageClass = 'page-docs';
});
app.controller('TeamPageController', ($scope) => {
$scope.pageClass = 'page-team';
app.controller('CollectivePageController', ($scope) => {
$scope.pageClass = 'page-collective';
});
}
].map(i => i(app));
@@ -1,7 +1,7 @@
import template from '../../templates/components/team-member-profile.html';
import template from '../../templates/components/teacher-profile.html';
export default function (app) {
app.component('teamMemberProfile', {
app.component('teacherProfile', {
bindings: {
member: '='
},
@@ -0,0 +1,16 @@
import {splitName} from '../../models/collective';
export default function (app) {
app.controller('CollectiveController', ($scope, api) => {
let sort = ['as-timasheva', 'va-sarzhin', 'od-gogoleva', 'my-valkova', 'vv-voronova', 'nv-andreeva'];
api.collective.collective(sort)
.success(collective => {
$scope.members = collective.map(person => {
if(person.picture) person.image = person.picture.big.url;
person.names = splitName(person.name);
return person;
});
});
});
};
-8
View File
@@ -1,8 +0,0 @@
export default function (app) {
app.controller('TeamController', ($scope, team) => {
$scope.teamMembers = team.team.map(person => {
person.names = team.splitName(person.name);
return person;
});
});
};