-
Notifications
You must be signed in to change notification settings - Fork 11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Task 3 #2
Open
ManginAlexander
wants to merge
4
commits into
cripi-javascript:master
Choose a base branch
from
ManginAlexander:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Task 3 #2
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
test('Create event', function () { | ||
"use strict"; | ||
var dateToString = function (currentTime) { | ||
var month = currentTime.getMonth() + 1, day = currentTime.getDate(), year = currentTime.getFullYear(); | ||
return month + "/" + day + "/" + year; | ||
}, undefinedDate, testEvent = new Event(undefinedDate); | ||
equal(dateToString(testEvent.start), dateToString(new Date())); | ||
testEvent = new Event(); | ||
equal(dateToString(testEvent.start), dateToString(new Date())); | ||
testEvent = new Event(new Date(5), new Date(3)); | ||
ok(testEvent.start.getTime() < testEvent.end.getTime()); | ||
testEvent = new Event(new Date(1), new Date(2)); | ||
ok(testEvent.start.getTime() < testEvent.end.getTime()); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
test('Leave Mark', function () { | ||
"use strict"; | ||
var testEvent = Event(new Date(1), new Date(2), "Earth"); | ||
testEvent.leaveMark("No number"); | ||
equal(testEvent.stars, 0, 'Если звездочку передали в виде не числа, то 0'); | ||
var undefinedVar; | ||
testEvent.leaveMark(undefinedVar); | ||
equal(testEvent.stars, 0, 'Если звездочку забыли объявить, то 0'); | ||
testEvent.leaveMark(-1); | ||
equal(testEvent.stars, 0, 'Звездочка не может быть меньше 0'); | ||
testEvent.leaveMark(6); | ||
equal(testEvent.stars, 5, 'Звездочка не может быть больше 5'); | ||
testEvent.leaveMark(3); | ||
equal(testEvent.stars, 3, '0-5 звездочка не изменяется, если целая'); | ||
testEvent.leaveMark(3.124); | ||
equal(testEvent.stars, 3, 'Звездочки - Int'); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
test('Set location',function () { | ||
"use strict"; | ||
var testEvent = Event(new Date(1), new Date(2), "Earth"),gps,name; | ||
testEvent.setLocation(gps,""); | ||
deepEqual(testEvent.location, { | ||
"gps" : {"x": 0,"y": 0}, | ||
"nameLocation" : "Earth" | ||
}, "GPS - некорректный => установить значения по умолчанию"); | ||
testEvent.setLocation("Not gps",""); | ||
deepEqual(testEvent.location, { | ||
"gps" : {"x": 0,"y": 0}, | ||
"nameLocation" : "Earth" | ||
}, "GPS - не содержит X или Y => установить значения по умолчанию"); | ||
testEvent.setLocation({"x": 0,"y": 0},[]); | ||
deepEqual(testEvent.location, { | ||
"gps" : {"x": 0,"y": 0}, | ||
"nameLocation" : "Earth" | ||
}, "Название места не строка => установить значения по умолчанию"); | ||
testEvent.setLocation({"x": 1,"y": 2},"Moon"); | ||
deepEqual(testEvent.location, { | ||
"gps" : {"x": 1,"y": 2}, | ||
"nameLocation" : "Moon" | ||
}, "GPS - не содержит X или Y => установить значения по умолчанию"); | ||
|
||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,115 @@ | ||
/** | ||
* Shell for "sql" operations with Array Events. | ||
* | ||
* @constructor | ||
* @method {pastEventBase} - Создает BaseEvent с пропущенными событиями | ||
* @method {pastEventBase} - Создает BaseEvent с грядущими событиями | ||
* @method {nowEventBase} - Создает BaseEvent с текущими событиями | ||
* @method {withFriend} - Создает BaseEvent с событиями, в которых принимал участие определенный человек | ||
* @method {getEventAfterDay} - Создает BaseEvent с грядущими событиями, которые наступят не раньше, чем через день | ||
* @method {getEventAfterWeek} - Создает BaseEvent с грядущими событиями, которые наступят не раньше, чем через неделю | ||
* @method {getEventAfterMonth} - Создает BaseEvent с грядущими событиями, которые наступят не раньше, чем через месяц | ||
* @method {getEventFromPeriod} - Создает BaseEvent с событиями, которые лежат между двумы датами [fromDate, toDate] | ||
* @method {getEventAfterMonth} - Создает BaseEvent с теми же событиями, но отсортированными по убыванию звезд | ||
* @method {getEventAfterMonth} - Создает BaseEvent с теми же событиями, но отсортироваными по возрастанию даты | ||
* @example - Смотри файл с тестами... | ||
*/ | ||
function BaseEvent(events) { | ||
"use strict"; | ||
this.events = events; | ||
//пропущенные, текущие, будущие события | ||
this.pastEventBase = function () { | ||
var currentDate = new Date(), needs; | ||
needs = this.events.filter(function (event) { | ||
return event.end.getTime() < currentDate.getTime(); | ||
}); | ||
return new BaseEvent(needs); | ||
}; | ||
this.nextEventBase = function () { | ||
var currentDate = new Date(), needs; | ||
needs = this.events.filter(function (event) { | ||
return event.start.getTime() > currentDate.getTime(); | ||
}); | ||
return new BaseEvent(needs); | ||
}; | ||
this.nowEventBase = function () { | ||
var currentDate = new Date(), needs; | ||
needs = this.events.filter(function (event) { | ||
return (event.start.getTime() <= currentDate.getTime() && event.end.getTime() >= currentDate.getTime()); | ||
}); | ||
return new BaseEvent(needs); | ||
}; | ||
//событие с участием друга (Друг отношение рефлексивное ^^) | ||
this.withFriend = function (myFriend) { | ||
var needs = this.events.filter(function (event) { | ||
return event.parties.some(function (party) { | ||
return party.name === myFriend.name; | ||
}); | ||
}); | ||
return new BaseEvent(needs); | ||
}; | ||
// События через период времени день, неделя, месяц | ||
this.getEventAfterWeek = function () { | ||
var currentDate = new Date(), needs; | ||
currentDate = new Date(currentDate.getTime() + 7 * 24 * 60 * 60 * 1000); | ||
needs = this.events.filter(function (event) { | ||
return event.start.getTime() > currentDate.getTime(); | ||
}); | ||
return new BaseEvent(needs); | ||
}; | ||
this.getEventAfterDay = function () { | ||
var currentDate = new Date(), needs; | ||
currentDate = new Date(currentDate.getTime() + 24 * 60 * 60 * 1000); | ||
needs = this.events.filter(function (event) { | ||
return event.start.getTime() > currentDate.getTime(); | ||
}); | ||
return new BaseEvent(needs); | ||
}; | ||
this.getEventAfterMonth = function () { | ||
var currentDate = new Date(), needs; | ||
if (currentDate.getMonth() === 11) { | ||
currentDate = new Date(currentDate.getFullYear() + 1, 0, currentDate.getDay()); | ||
} else { | ||
currentDate = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, currentDate.getDay()); | ||
} | ||
needs = this.events.filter(function (event) { | ||
return event.start.getTime() > currentDate.getTime(); | ||
}); | ||
return new BaseEvent(needs); | ||
}; | ||
// События за период | ||
this.getEventFromPeriod = function (fromDate, toDate) { | ||
var needs = this.events.filter(function (event) { | ||
return (event.start.getTime() > fromDate.getTime() && event.end.getTime() < toDate.getTime()); | ||
}); | ||
return new BaseEvent(needs); | ||
}; | ||
this.sortByStars = function () { | ||
var events = this.events.slice(0), comparer; | ||
comparer = function compare(a, b) { | ||
if (a.stars > b.stars) { | ||
return -1; | ||
} | ||
if (a.stars < b.stars) { | ||
return 1; | ||
} | ||
return 0; | ||
}; | ||
events.sort(comparer); | ||
return new BaseEvent(events); | ||
}; | ||
this.sortByDate = function () { | ||
var events = this.events.slice(0), comparer; | ||
comparer = function compare(a, b) { | ||
if (a.start.getTime() < b.start.getTime()) { | ||
return -1; | ||
} | ||
if (a.start.getTime() > b.start.getTime()) { | ||
return 1; | ||
} | ||
return 0; | ||
}; | ||
events.sort(comparer); | ||
return new BaseEvent(events); | ||
}; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Чейнинг - это очень хорошо. Ты половину задания 4 пары уже выполнил ;-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Суть:
И еще у меня вопрос о литературе.
Для любого языка есть куча книг о том как нужно писать по стандарту(где в очередной раз объяснят как работает цикл for, whilt и волшебный if).
Вопрос:
А не знаешь есть ли книга о js в которой рассказывается не как писать по стандарту, а как правильно писать на js. Так как я думаю ты не успеешь рассказать о всех прелестях этого языка за этот курс.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maintainable JavaScript http://www.amazon.com/Maintainable-JavaScript-Nicholas-C-Zakas/dp/1449327680
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Вообще сейчас идет "тренд" Event Driven Development (Loose Coupling) когда все приложение построено на событиях. И модули вместо вызова метода другого модуля общаются событиями http://habrahabr.ru/post/123635/