-
Notifications
You must be signed in to change notification settings - Fork 10
Пожалуйста, проверьте моё домашнее задание #13
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
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,182 @@ | ||
/** | ||
* Возвращает объект Event | ||
* | ||
* @param {Object} requiredParams Обязательные параметры | ||
* @param {Object} optionalParams Дополнительные параметры | ||
* | ||
* @example | ||
* var required = { | ||
* start: new Date('10-26-2012 02:12'), | ||
* end: new Date('10-27-2012'), | ||
* name: 'Поездка на озеро Тургояк', | ||
* isNotify: 'true', | ||
* notify: new Date('10-26-2012') | ||
* }; | ||
* var optional = { | ||
* description: 'Отличная возможность отдохнуть и насладиться природой', | ||
* place: 'Озеро Тургояк', | ||
* importance: 'h', | ||
* url: 'http://www.turgoyak.com/' | ||
* }; | ||
* getEvent(required, optional); | ||
* | ||
* @return {Object} | ||
*/ | ||
function getEvent(requiredParams, optionalParams) { | ||
"use strict"; | ||
if (requiredParams.start > requiredParams.end) { | ||
throw new Error("Время начала мероприятия не может быть позже времени окончания!"); | ||
} | ||
var imp = optionalParams.importance; | ||
if (!(imp == 'h' || imp == 'l' || imp == 'm')) { | ||
imp = 'm'; | ||
} | ||
return { | ||
start: new Date(+requiredParams.start), | ||
end: new Date(+requiredParams.end), | ||
name: requiredParams.name || "Событие", | ||
isNotify: !!requiredParams.isNotify || false, | ||
notify: new Date(+requiredParams.notify), | ||
description: optionalParams.description || "", | ||
place: optionalParams.place || "", | ||
importance: imp, | ||
url: optionalParams.url | ||
}; | ||
} | ||
function printEventToLog(event) { | ||
|
||
console.log(event.name + ": " + event.start + " " + event.end + " " + event.importance + " " + event.description); | ||
//console.log(event.name); | ||
} | ||
function printEventArrayToLog(eventArray) { | ||
for (key in eventArray) { | ||
if (eventArray[key].name) { | ||
printEventToLog(eventArray[key]); | ||
} | ||
} | ||
} | ||
//Случайное число из интервала | ||
function randomFrom(from, to) { | ||
'use strict'; | ||
return Math.floor(Math.random() * (to - from + 1)) + from; | ||
} | ||
|
||
function generateEvent(count) { | ||
|
||
var i = 0; | ||
var ar = []; | ||
var names = ["Пара", "Сборы", "Экзамен", "Поездка", "Вечеринка"]; | ||
var importances = ['l', 'm', 'h']; | ||
var isnotifys = [false, true]; | ||
var req, opt; | ||
var random; | ||
var event; | ||
var today = new Date(); | ||
for (i = 1; i <= count; i++) { | ||
random = randomFrom(-30, 29); | ||
req = { | ||
start: today.addDays(random), | ||
end: today.addDays(random + 1), | ||
name: names[randomFrom(0,4)], | ||
isNotify: isnotifys[randomFrom(0,1)], | ||
nonify: today.addDays(random) | ||
}; | ||
opt = { | ||
importance: importances[randomFrom(0,2)] | ||
}; | ||
event = getEvent(req, opt); | ||
ar.push(event); | ||
//printEventToLog(event); | ||
} | ||
printEventArrayToLog(ar); | ||
return ar; | ||
} | ||
Date.prototype.addDays = function(days) { | ||
var ms = new Date().getTime() + (86400000 * days); | ||
var added = new Date(ms); | ||
return added; | ||
}; | ||
Array.prototype.happenedEvents = function() | ||
{ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. У тебя скобка то на одной строке, то на другой - определись уж со стилем ;-) |
||
return this.filter(function(event){ | ||
return event.end < new Date(); | ||
}); | ||
}; | ||
Array.prototype.futureEvents = function() | ||
{ | ||
return this.filter(function(event){ | ||
return event.start > new Date(); | ||
}); | ||
}; | ||
Array.prototype.nameEvents = function(name) | ||
{ | ||
return this.filter(function(event){ | ||
return event.name == name; | ||
}); | ||
}; | ||
Array.prototype.sortEvents = function(sortFun) | ||
{ | ||
return this.sort(sortFun); | ||
}; | ||
function sortByName (a, b) { | ||
if (a.name < b.name) { | ||
return -1; | ||
} | ||
else { | ||
if (a.name == b.name) { | ||
return 0; | ||
} | ||
else { | ||
return 1; | ||
} | ||
} | ||
} | ||
function sortByStart (a, b) { | ||
if (a.start < b.start) { | ||
return -1; | ||
} | ||
else { | ||
if (a.start == b.start) { | ||
return 0; | ||
} | ||
else { | ||
return 1; | ||
} | ||
} | ||
} | ||
function sortByImportance (a, b) { | ||
var imp = new Array(); | ||
imp['l'] = 0; | ||
imp['m'] = 1; | ||
imp['h'] = 2; | ||
if (imp[a.importance] < imp[b.importance]) { | ||
return -1; | ||
} | ||
else { | ||
if (imp[a.importance] == imp[b.importance]) { | ||
return 0; | ||
} | ||
else { | ||
return 1; | ||
} | ||
} | ||
} | ||
var eventAr = new Array(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
console.log("Случайные события:"); | ||
eventAr = generateEvent(30); | ||
console.log("Прошедшие события:"); | ||
printEventArrayToLog(eventAr.happenedEvents()); | ||
console.log("Предстоящие события:"); | ||
printEventArrayToLog(eventAr.futureEvents()); | ||
console.log("Пары:"); | ||
printEventArrayToLog(eventAr.nameEvents("Пара")); | ||
console.log("События, отсортированные по имени:"); | ||
printEventArrayToLog(eventAr.sortEvents(sortByName)); | ||
console.log("События, отсортированные по началу события:"); | ||
printEventArrayToLog(eventAr.sortEvents(sortByStart)); | ||
console.log("События, отсортированные по важности:"); | ||
printEventArrayToLog(eventAr.sortEvents(sortByImportance)); | ||
console.log("Предстоящие пары, отсортированные важности:"); | ||
printEventArrayToLog(eventAr.nameEvents("Пара").futureEvents().sortEvents(sortByImportance)); | ||
console.log("Прошедшие вечеринки, отсортированные по важности и времени начала:"); | ||
printEventArrayToLog(eventAr.nameEvents("Вечеринка").happenedEvents().sortEvents(sortByImportance).sortEvents(sortByStart)); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<body> | ||
<SCRIPT type="text/javascript" src="generate.js"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Имена тегов принято писать с маленькой буквы. |
||
</SCRIPT> | ||
|
||
</body> | ||
</html> |
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.
Код лучше читается если тело функции имеет отступ как в остальных твоих функциях.