Sorting full

htmlacademy-ecmascript · Aug 20, 2024 · af7c685 · af7c685
1 parent 16304da
commit af7c685
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 34 deletions.
diff --git a/src/mock/points.js b/src/mock/points.js
@@ -1,18 +1,6 @@
 import { toCamelCase } from '../util.js'
 
 export const points = [
-  {
-    id: 'f4b62099-293f-4c3d-a702-94eec4a2808c',
-    basePrice: 11300,
-    dateFrom: '2025-07-10T00:55:56.845Z',
-    dateTo: '2025-07-11T11:01:13.375Z',
-    destination: 'bfa5cb75-a1fe-4b77-a83c-0e528e910e04',
-    isFavorite: false,
-    offers: [
-      'b4c3e4e6-9053-42ce-b747-e281314baa31'
-    ],
-    type: 'taxi'
-  },
   {
     id: 'f4b62099-293f-4c3d-a702-94eec4a2808d',
     basePrice: 11200,
@@ -37,6 +25,18 @@ export const points = [
     offers: [],
     type: 'ship'
   },
+  {
+    id: 'f4b62099-293f-4c3d-a702-94eec4a2808c',
+    basePrice: 11300,
+    dateFrom: '2025-07-10T00:55:56.845Z',
+    dateTo: '2025-07-11T11:01:13.375Z',
+    destination: 'bfa5cb75-a1fe-4b77-a83c-0e528e910e04',
+    isFavorite: false,
+    offers: [
+      'b4c3e4e6-9053-42ce-b747-e281314baa31'
+    ],
+    type: 'taxi'
+  },
   {
     id: 'f4b62099-293f-4c3d-a702-94eec4a2808f',
     basePrice: 11100,

diff --git a/src/presenter/trip-presenter.js b/src/presenter/trip-presenter.js
@@ -5,7 +5,7 @@ import TripListView from '../view/trip-list-view.js';
 import ListEmptyView from '../view/list-empty-view.js';
 import PointModel from '../model/point-model.js';
 import PointPresenter from './point-presenter.js';
-import { updateItem, sortPointsByDay, sortPointsByPrice, sortPointsByTime } from '../util.js';
+import { updateItem, sortPointsByDay, findSortingDuration } from '../util.js';
 import { SortingTypes } from '../const.js';
 
 
@@ -64,10 +64,11 @@ export default class TripPresenter {
         this.#points.sort(sortPointsByDay);
         break;
       case SortingTypes.PRICE:
-        this.#points.sort(sortPointsByPrice);
+        this.#points.sort((pointA, pointB) => pointA.basePrice - pointB.basePrice);
         break;
       case SortingTypes.TIME:
-        this.#points.sort(sortPointsByTime);
+
+        this.#points.sort((pointA, pointB) => findSortingDuration(pointA) - findSortingDuration(pointB));
         break;
       default:
         this.#points = [...this.#sourcedPointsOrder];
@@ -76,19 +77,19 @@ export default class TripPresenter {
   }
 
   #handleSortingTypeChange(sortingType) {
-
     if (this.#currentSortingType === sortingType) {
       return;
     }
     this.#sortPoints(sortingType);
     this.#clearPointList();
-    this.#points.forEach((point) => this.#renderPoint(point, this.#destinations, this.#offers));
+    this.#renderSorting();
 
+    this.#points.forEach((point) => this.#renderPoint(point, this.#destinations, this.#offers));
   }
 
   #renderSorting() {
     this.#sortingComponent = new SortingView({
-      onSortTypeChange: this.#handleSortingTypeChange
+      onSortTypeChange: (sortingType) => this.#handleSortingTypeChange(sortingType),
     });
 
     render(this.#sortingComponent, this.#container);

diff --git a/src/util.js b/src/util.js
@@ -5,8 +5,10 @@ const humanizeDueDate = (dueDate, dateFormat) => dueDate ? dayjs(dueDate).format
 
 const capitalize = (str) => str[0].toUpperCase() + str.slice(1);
 
-const findDuration = (date1, date2) => {
-  let minutesDuration = dayjs(date1).diff(dayjs(date2), 'm');
+const findSortingDuration = (point) => dayjs(point.dateTo).diff(dayjs(point.dateFrom), 'm');
+
+const findDuration = (point) => {
+  let minutesDuration = findSortingDuration(point);
   const minutesAfterHours = minutesDuration % 60;
 
   if (minutesDuration >= 60 && minutesAfterHours !== 0) {
@@ -62,14 +64,4 @@ const sortPointsByDay = (pointA, pointB) => {
   return weight ?? dayjs(pointA.dateFrom).diff(dayjs(pointB.dateFrom));
 };
 
-const sortPointsByPrice = (pointA, pointB) => getWeightForDate(pointA.basPrice, pointB.basPrice);
-
-const sortPointsByTime = (pointA, pointB) => {
-  pointA = findDuration(pointA.dateFrom, pointA.dateTo);
-  pointB = findDuration(pointB.dateFrom, pointB.dateTo);
-
-  return getWeightForDate(pointA, pointB);
-};
-
-
-export { humanizeDueDate, capitalize, findDuration, toCamelCase, checkPastPoints, checkPresentPoints, updateItem, sortPointsByDay, sortPointsByPrice, sortPointsByTime };
+export { humanizeDueDate, capitalize, findDuration, toCamelCase, checkPastPoints, checkPresentPoints, updateItem, sortPointsByDay, findSortingDuration };
diff --git a/src/view/sorting-view.js b/src/view/sorting-view.js
@@ -2,11 +2,11 @@ import { SortingTypes } from '../const.js';
 import AbstractView from '../framework/view/abstract-view.js';
 import { capitalize } from '../util.js';
 
-const findCheckedElement = (element) => element === 'price' ? 'checked' : '';
+// const findCheckedElement = (element) => element === 'day' ? 'checked' : '';
 
 const createSortingElement = (sortingType) => `
   <div class="trip-sort__item  trip-sort__item--${sortingType}">
-    <input id="sort-${sortingType}" class="trip-sort__input  visually-hidden" type="radio" name="trip-sort" value="sort-${sortingType}" ${findCheckedElement(sortingType)}
+    <input id="sort-${sortingType}" class="trip-sort__input  visually-hidden" type="radio" name="trip-sort" value="sort-${sortingType}"
       data-sort-type="${sortingType}"
     ${sortingType === 'event' ? 'disabled' : ''}
     ${sortingType === 'offers' ? 'disabled' : ''}>

diff --git a/src/view/trip-point-view.js b/src/view/trip-point-view.js
@@ -34,7 +34,7 @@ const createScheduleTemplate = (point) => {
       &mdash;
       <time class="event__end-time" datetime="${dateTo}">${humanizeDueDate(dateTo, dateFormat.HMM)}</time>
     </p>
-    <p class="event__duration">${findDuration(dateTo, dateFrom)}</p>
+    <p class="event__duration">${findDuration(point)}</p>
     </div>
     <p class="event__price">
       &euro;&nbsp;<span class="event__price-value">${basePrice}</span>