Skip to content
This repository was archived by the owner on Sep 6, 2020. It is now read-only.

endの時刻がnullでも動くようにする #124

Open
ymits wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

endの時刻がnullでも動くようにする #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac88e11
時刻が無いデータの場合、１日前のデータまで取得してしまう問題解消
ymits Oct 3, 2015
6db3a02
endの時刻がnullでも動くようにしました。
ymits Oct 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions app/scripts/models/event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@
* @returns {Date} 最終日の終了日時
*/
getEndDate: function () {
return this.periods[this.periods.length - 1].end;
var endDatetime = this.periods[this.periods.length - 1].end;
if (endDatetime) {
return endDatetime;
} else {
return this.periods[this.periods.length - 1].start;
}
},

/**
Expand Down Expand Up @@ -88,7 +93,7 @@
if (param.fromDate) {
var fromDate = getDateTime(param.fromDate);
isInclude = _.some(fes.periods, function (period) {
return getDateTime(period.end) >= fromDate;
return getDateTime(period.start) >= fromDate;
});
if (!isInclude) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/stores/eventStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// 日付をDate型に変換
data.periods = _.map(data.periods, function (period) {
period.start = new Date(period.start);
period.end = new Date(period.end);
period.end = (period.end ? new Date(period.end) : null);
return period;
});
this.dataStore[data.id] = new cfc.Event(data);
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/views/fes-detail.tag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<span class="date">{moment(period.start).format('MM/DD')}</span>
<span class={day-of-week:true,sat:6===period.start.getDay(),sun:0===period.start.getDay()}>{moment(period.start).format('dd')}</span>
<span class="clock">
<span if={moment(period.start).format('HH:mm') != '00:00'}>{moment(period.start).format('HH:mm')}</span>
<span if={moment(period.end).format('HH:mm') != '00:00'}> - {moment(period.end).format('HH:mm')}</span>
<span>{moment(period.start).format('HH:mm')}</span>
<span if={period.end != null}> - {moment(period.end).format('HH:mm')}</span>
</span>
</li>
</ul>
Expand Down