Schedule ES6 update

This commit is contained in:
tmshv committed 2016-02-23 01:46:57 +03:00
1 parent b9526ad1a6
commit 9025044ae5
19 files changed
+249 -223

No files matched your search

@@ -0,0 +1,8 @@
<div class="schedule-record" ng-class="{even: $ctrl.i % 2 === 0, empty: !$ctrl.record.content.lesson}">
<div class="schedule-record__head">Группа {{$ctrl.record.name}} ({{$ctrl.record.time}})</div>
<div class="schedule-record__main">
<p class="schedule-record__name">{{$ctrl.record.content.lesson}}</p>
<p class="schedule-record__tutor">{{$ctrl.record.content.teacher}}</p>
<p class="schedule-record__time" ng-repeat="time in $ctrl.record.content.time">{{time}}</p>
</div>
</div>
@@ -0,0 +1,10 @@
<div class="schedule-slider__slide" ng-class="{current: $ctrl.day.current}">
<div class="schedule-slider__head">
<p>{{$ctrl.day.day}}</p>
<p>{{$ctrl.day.date}}</p>
</div>
<div class="schedule-slider__body">
<schedule-record ng-repeat="group in $ctrl.day.groups track by $index" record="group" i="$index"></schedule-record>
</div>
</div>
@@ -0,0 +1 @@
<div class="schedule-slick"></div>
@@ -1,49 +1,49 @@
<div class="schedule-table" ng-show="groups">
<div class="schedule-table" ng-show="$ctrl.schedule">
<table>
<thead>
<tr>
<th class="group">Гр.</th>
<th ng-class="{current: isToday(0)}">
<th ng-class="{current: $ctrl.isToday(0)}">
<p class="day">Понедельник</p>
<p class="date">{{weekDay(0)}}</p>
<p class="date">{{$ctrl.weekDay(0)}}</p>
</th>
<th ng-class="{current: isToday(1)}">
<th ng-class="{current: $ctrl.isToday(1)}">
<p class="day">Вторник</p>
<p class="date">{{weekDay(1)}}</p>
<p class="date">{{$ctrl.weekDay(1)}}</p>
</th>
<th ng-class="{current: isToday(2)}">
<th ng-class="{current: $ctrl.isToday(2)}">
<p class="day">Среда</p>
<p class="date">{{weekDay(2)}}</p>
<p class="date">{{$ctrl.weekDay(2)}}</p>
</th>
<th ng-class="{current: isToday(3)}">
<th ng-class="{current: $ctrl.isToday(3)}">
<p class="day">Четверг</p>
<p class="date">{{weekDay(3)}}</p>
<p class="date">{{$ctrl.weekDay(3)}}</p>
</th>
<th ng-class="{current: isToday(4)}">
<th ng-class="{current: $ctrl.isToday(4)}">
<p class="day">Пятница</p>
<p class="date">{{weekDay(4)}}</p>
<p class="date">{{$ctrl.weekDay(4)}}</p>
</th>
<th ng-class="{current: isToday(5)}">
<th ng-class="{current: $ctrl.isToday(5)}">
<p class="day">Суббота</p>
<p class="date">{{weekDay(5)}}</p>
<p class="date">{{$ctrl.weekDay(5)}}</p>
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="group in groups">
<tr ng-repeat="group in $ctrl.schedule">
<td class="group">
<p class="name">{{group.name}}</p>
<p class="time">{{group.time}}</p>
</td>
<td ng-repeat="day in group.days track by $index" ng-class="{current: isToday($index)}">
<td ng-repeat="day in group.days track by $index" ng-class="{current: $ctrl.isToday($index)}">
<p class="lesson"><a href="">{{day.lesson}}</a></p>
<p class="teacher"><a href="">{{day.teacher}}</a></p>
<p class="time">{{day.time[0]}}</p>
+8
View File
@@ -0,0 +1,8 @@
<div ng-switch="$ctrl.type">
<schedule-slider schedule="$ctrl.schedule"
ng-switch-when="slider"
></schedule-slider>
<schedule-table schedule="$ctrl.schedule"
ng-switch-default
></schedule-table>
</div>
+7 -3
View File
@@ -1,9 +1,13 @@
<div class="schedule" ng-controller="ScheduleController">
<div class="content content_wide" ng-controller="ScheduleController">
<p>
<label>
<select ng-model="currentSchedule" ng-change="loadSchedule(currentSchedule, true)" ng-options="s.text for s in schedules"></select>
<select
ng-model="currentSchedule"
ng-change="loadSchedule(currentSchedule, true)"
ng-options="s.text for s in schedules">
</select>
</label>
</p>
<schedule groups="groups"></schedule>
<schedule schedule="schedule"></schedule>
</div>
-8
View File
@@ -1,8 +0,0 @@
<div class="schedule-record" ng-class="{even: i % 2 === 0, empty: !record.content.lesson}">
<div class="schedule-record__head">Группа {{record.name}} ({{record.time}})</div>
<div class="schedule-record__main">
<p class="schedule-record__name">{{record.content.lesson}}</p>
<p class="schedule-record__tutor">{{record.content.teacher}}</p>
<p class="schedule-record__time" ng-repeat="time in record.content.time">{{time}}</p>
</div>
</div>
-10
View File
@@ -1,10 +0,0 @@
<div class="schedule-slider__slide" ng-class="{current: day.current}">
<div class="schedule-slider__head">
<p>{{day.day}}</p>
<p>{{day.date}}</p>
</div>
<div class="schedule-slider__body">
<schedule-record ng-repeat="group in day.groups track by $index" record="group" i="$index"></schedule-record>
</div>
</div>