Merge pull request #8 from Talurion/module7-task1

htmlacademy-ecmascript · Oct 18, 2024 · 07f697b · 07f697b
2 parents d2cf2ad + 8fd9d6d
commit 07f697b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/src/presenter/board-presenter.js b/src/presenter/board-presenter.js
@@ -5,7 +5,7 @@ import EventPresenter from './event-presenter.js';
 import NoEventsView from '../view/no-events-view.js';
 import NewEventPresenter from './new-event-presenter.js';
 import { SortType, UpdateType, UserAction, FilterType } from '../const.js';
-import { sortEventsPrice, sortEventsTime } from '../utils/event.js';
+import { sortEventsPrice, sortEventsTime, sortEventsDate } from '../utils/event.js';
 import { filter } from '../utils/filter.js';
 
 
@@ -61,7 +61,7 @@ export default class BoardPresenter {
       case SortType.TIME:
         return filteredEvents.sort(sortEventsTime);
     }
-    return filteredEvents;
+    return filteredEvents.sort(sortEventsDate);
   }
 
   init () {

diff --git a/src/utils/event.js b/src/utils/event.js
@@ -29,12 +29,15 @@ const sortEventsTime = (eventA, eventB) => {
   return durationB - durationA;
 };
 
+const sortEventsDate = (eventA, eventB) => new Date(eventA.dateFrom) - new Date(eventB.dateFrom);
+
 export {
   humanizeDueDate,
   isEventFuture,
   isEventPresent,
   isEventPast,
   isDatesEqual,
   sortEventsPrice,
-  sortEventsTime
+  sortEventsTime,
+  sortEventsDate
 };
diff --git a/src/view/new-event-edit-element-view.js b/src/view/new-event-edit-element-view.js
@@ -1,3 +1,4 @@
+import he from 'he';
 import AbstractStatefulView from '../framework/view/abstract-stateful-view';
 import { EVENTS_TYPES } from '../const';
 import flatpickr from 'flatpickr';
@@ -111,7 +112,7 @@ const createNewEventEditElementTemplate = (eventData, destinationsList, isDefaul
                     <label class="event__label  event__type-output" for="event-destination-1">
                       ${type}
                     </label>
-                    <input class="event__input  event__input--destination" id="${destination.id === undefined ? '' : destination.id}" type="text" name="event-destination" value="${destination.name === undefined ? '' : destination.name}" list="destination-list-1">
+                    <input class="event__input  event__input--destination" id="${destination.id === undefined ? '' : destination.id}" type="text" name="event-destination" value="${destination.name === undefined ? '' : he.encode(destination.name)}" list="destination-list-1">
                     <datalist id="destination-list-1">
                     ${createDestinations(destinationsList)}
                     </datalist>
@@ -130,7 +131,7 @@ const createNewEventEditElementTemplate = (eventData, destinationsList, isDefaul
                       <span class="visually-hidden">Price</span>
                       &euro;
                     </label>
-                    <input class="event__input  event__input--price" id="event-price-1" type="text" name="event-price" value="${basePrice}">
+                    <input class="event__input  event__input--price" id="event-price-1" type="number" name="event-price" value="${basePrice}">
                   </div>
 
                   <button class="event__save-btn  btn  btn--blue" type="submit">Save</button>

diff --git a/src/view/new-events-item-view.js b/src/view/new-events-item-view.js
@@ -1,3 +1,4 @@
+import he from 'he';
 import dayjs from 'dayjs';
 import AbstractView from '../framework/view/abstract-view';
 import { humanizeDueDate } from '../utils/event';
@@ -57,7 +58,7 @@ const createNewTripEventsItemTemplate = (eventData) => {
                 <div class="event__type">
                   <img class="event__type-icon" width="42" height="42" src="img/icons/${type}.png" alt="Event type icon">
                 </div>
-                <h3 class="event__title">${type} ${destination.name}</h3>
+                <h3 class="event__title">${type} ${he.encode(destination.name)}</h3>
                 <div class="event__schedule">
                   <p class="event__time">
                     <time class="event__start-time" datetime="${dateFrom}">${humanizedStartTime}</time>

diff --git a/src/view/no-events-view.js b/src/view/no-events-view.js
@@ -3,9 +3,9 @@ import { FilterType } from '../const.js';
 
 const NoTasksTextType = {
   [FilterType.EVERYTHING]: 'Click New Event to create your first point',
-  [FilterType.FUTURE]: 'There are no future events',
-  [FilterType.PRESENT]: 'There are no present events',
-  [FilterType.PAST]: 'There are no past events',
+  [FilterType.FUTURE]: 'There are no future events now',
+  [FilterType.PRESENT]: 'There are no present events now',
+  [FilterType.PAST]: 'There are no past events now',
 };
 
 const createNoEventsViewTemplate = (filterType) => {