Skip to content
Open

done #21

Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/js_task_3.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5,480 changes: 5,477 additions & 3 deletions package-lock.json

Large diffs are not rendered by default.

38 changes: 37 additions & 1 deletion src/task_1/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,42 @@
@param {number} hours - Час
@param {number} minutes - Минуты
*/
function Time(hours, minutes) { };
function Time(hours, minutes) {
if(hours >= 1 && hours < 24 && minutes >= 0 && minutes < 60) {
this.hours = hours;
this.minutes = minutes;
}
else {
throw new Error('Неверно указано время');
}
}

Time.prototype.isEarlier = function (object) {
if (object.hours > this.hours) {
console.log(true);
return true
}
else if (object.hours >= this.hours && object.minutes > this.minutes) {
console.log(true);
return true
}

else {
console.log(false);
return false;
}
}

Time.prototype.isLater = function (object) {
if (object.hours < this.hours) {
return true
}
else if (object.hours >= this.hours && object.minutes >= this.minutes) {
return false
}
else if (object.hours <= this.hours&& object.minutes <= this.minutes) {
return true
}
}

module.exports.Time = Time;
35 changes: 34 additions & 1 deletion src/task_2/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,39 @@ const { Time } = require('../task_1/index');
@param {Time} startTime - Время начала встречи
@param {Time} endTime - Время конца встречи
*/
function Meeting(meetingDate, startTime, endTime) { };
function Meeting(meetingDate, startTime, endTime) {
if (
startTime.hours >= 8 &&
startTime.hours <= 19 &&
meetingDate instanceof Date &&
startTime instanceof Time &&
endTime instanceof Time &&
startTime &&
endTime
) {
this.meetingDate = meetingDate;
this.startTime = startTime;
this.endTime = endTime;
} else {
throw new Error("Время должно быть между 8 и 19");
}
}

//Должен возвращать true, если встреча, у которой был вызван метод,
// пересекает переданный временной промежутук
Meeting.prototype.isMeetingInTimeRange = function (startTime, endTime) {
if (
this.startTime.hours === startTime.hours ||
(this.startTime.minutes <= startTime.minutes &&
this.endTime.hours <= endTime.hours) ||
this.endTime.minutes <= endTime.minutes
) {
console.log(true);
return true;
} else {
console.log(false);
return false;
}
};

module.exports.Meeting = Meeting;
35 changes: 34 additions & 1 deletion src/task_3/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,40 @@
@param {Date} vacationStartDate - Дата начала отпуска
@param {Date} vacationEndDate - Время конца отпуска
*/
function Vacation(vacationStartDate, vacationEndDate) {
if (vacationStartDate < vacationEndDate) {
if (
vacationStartDate instanceof Date &&
vacationEndDate instanceof Date &&
vacationStartDate &&
vacationEndDate
) {
this.vacationStartDate = vacationStartDate;
this.vacationEndDate = vacationEndDate;
} else {
throw new Error("ошибка");
}
} else if (
vacationStartDate > vacationEndDate ||
vacationStartDate === vacationEndDate ||
vacationStartDate === undefined ||
vacationEndDate === undefined
) {
throw new Error("ошибка");
}
else {
throw new Error("ошибка");
}
}

function Vacation(vacationStartDate, vacationEndDate) { };
Vacation.prototype.isDateInVacation = function (date) {
if (date >= this.vacationStartDate && date <= this.vacationEndDate) {
console.log(true);
return true;
}
else {
return false
}
};

module.exports.Vacation = Vacation;
9 changes: 8 additions & 1 deletion src/task_4/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ const { Vacation } = require('../task_3/index');
@param {Array<Vacation>} vacations - Массив отпусков
*/

function Organaizer(meetings, vacations) { };
function Organaizer(meetings, vacations) {
meetings = [];
vacations = [];
if (meetings instanceof Array && vacations instanceof Array) {
this.meetings = meetings;
this.vacations = vacations;
}
}

module.exports.Organaizer = Organaizer;
48 changes: 47 additions & 1 deletion src/task_5/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
const { Organaizer } = require('../task_4/index');
const { Time } = require('../../src/task_1/index');
const { Meeting } = require('../../src/task_2/index');
const { Vacation } = require('../../src/task_3/index');
const { Organaizer } = require('../../src/task_4/index');

/* Задача 5 - Расширить прототип класса Organaizer следующими методами:
5.1. addMeeting, принимающий — объект класса Meeting.
Expand All @@ -15,4 +18,47 @@ const { Organaizer } = require('../task_4/index');
В промежуток отпуска не назначено никаких встреч
*/

Organaizer.prototype.addMeeting = function (Meeting, Vocation) {
if (this.meetings.length === 0) {
this.meetings.push(Meeting);

return true;
}

let shouldPush = false;

this.meetings.forEach((meet) => {
if (
meet.meetingDate.getTime() == Meeting.meetingDate.getTime() &&
!meet.isMeetingInTimeRange(Meeting.startTime.hours, Meeting.endTime.hours)
) {
shouldPush = true;
return;
} else if (meet.meetingDate.getTime() !== Meeting.meetingDate.getTime()) {
shouldPush = true;
return;
} else if (
meet.meetingDate.getTime() == Meeting.meetingDate.getTime() &&
meet.isMeetingInTimeRange(Meeting.startTime.hours, Meeting.endTime.hours)
) {
shouldPush = false;
return;
} else if (
meet.meetingDate.getTime() == Meeting.meetingDate.getTime() &&
meet.isMeetingInTimeRange(Meeting.startTime.hours, Meeting.endTime.hours)
) {
shouldPush = false;
return;
}
});

if (shouldPush) {
this.meetings.push(Meeting);
return true;
}

return false;
};


module.exports.Organaizer = Organaizer;
1 change: 1 addition & 0 deletions test/task_5/index.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const { Time } = require('../../src/task_1/index');
const { Meeting } = require('../../src/task_2/index');
const { Vacation } = require('../../src/task_3/index');

const { Organaizer } = require('../../src/task_5/index');

const organaizer = new Organaizer([], []);
Expand Down