Merge pull request #5 from YouAreNotReady/module5-task2

Author: keksobot

index.html

@@ -234,6 +234,7 @@ <h2 class="data-error__title">Не удалось загрузить данны
       </section>
     </template>
 
-  <script src="/js/main.js" type="module"></script>
+  <script src="./js/main.js" type="module"></script>
+  <script src="./js/functions.js"></script>
 </body>
 </html>

js/data-generator.js

@@ -44,7 +44,7 @@ const createIdGenerator = function(min, max) {
     let lastGeneratedId = getRandomInteger(min, max);
 
     if(previousValues.length >= (max - min + 1)) {
-      console.log('Закончились уникальные идентификаторы');
+      console.error('Закончились уникальные идентификаторы');
       return null;
     }
 
@@ -61,15 +61,15 @@ const generateCommentId = createIdGenerator(1, PHOTO_OBJECTS_AMOUNT * MAX_COMMEN
 
 const createCommentObject = () => ({
   id: generateCommentId(),
-  avatar:  'img/avatar-' + getRandomInteger(1, 6) + '.svg',
+  avatar:  `img/avatar-${getRandomInteger(1, 6)}.svg`,
   message: getRandomArrayElement(MESSAGES),
   name: getRandomArrayElement(NAMES),
 });
 
 
 const createPhotoObject = (_, index) => ({
   id: index,
-  url: 'photos/' + index++ + '.jpg',
+  url: `photos/${index++}.jpg`,
   description: getRandomArrayElement(DESCRIPTIONS),
   likes: getRandomInteger(MIN_LIKES, MAX_LIKES),
   comments: Array.from({length: getRandomInteger(MIN_COMMENTS, MAX_COMMENTS)}, createCommentObject)

js/functions.js

@@ -1,6 +1,4 @@
-function isLesserOrEqual(string, maxLength) {
-  return string.length <= maxLength;
-}
+const isLesserOrEqual = (string, maxLength) => string.length <= maxLength;
 
 function isPalindrome(string) {
   const normalizedString = string.replaceAll(' ', '').toLowerCase();
@@ -22,3 +20,13 @@ function toPositiveNumber(string) {
   return parseInt(result, 10);
 }
 
+const timeToMinutesNumber = (arr) => Number(arr[0]) * 60 + Number(arr[1]);
+
+
+function isMeetingInWorkingHours(timeStart, timeEnd, meetingTime, meetingDuration) {
+  const timeStartNormalized = timeToMinutesNumber(timeStart.split(':'));
+  const timeEndNormalized = timeToMinutesNumber(timeEnd.split(':'));
+  const meetingTimeNormalized = timeToMinutesNumber(meetingTime.split(':'));
+
+  return (meetingTimeNormalized >= timeStartNormalized && (meetingTimeNormalized + meetingDuration) <= timeEndNormalized);
+}