calendar now sorts by time and priority
This commit is contained in:
Vendored
+11
-4
@@ -1653,17 +1653,20 @@
|
|||||||
});
|
});
|
||||||
const objectConverter = (messageObject) => {
|
const objectConverter = (messageObject) => {
|
||||||
const latest = chat.getMostRecentContent(messageObject);
|
const latest = chat.getMostRecentContent(messageObject);
|
||||||
const timeString = latest.time ?? "00:00";
|
const timeString = latest.time || "00:00";
|
||||||
const [hour, minute] = timeString.split(":");
|
const [hour, minute] = timeString.split(":");
|
||||||
const hourInMinutes = parseInt(hour) * 60;
|
const hourInMinutes = parseInt(hour) * 60;
|
||||||
const minutesTotal = parseInt(minute) + hourInMinutes;
|
const minutesTotal = parseInt(minute) + hourInMinutes;
|
||||||
|
const priority = latest.priority ?? 0;
|
||||||
|
const priorityInverse = 100 - priority;
|
||||||
|
const order = `${minutesTotal}${priorityInverse}`;
|
||||||
const view = ObjectEntryView(
|
const view = ObjectEntryView(
|
||||||
chat,
|
chat,
|
||||||
messageObject,
|
messageObject,
|
||||||
selectedObject,
|
selectedObject,
|
||||||
isShowingObjectModal
|
isShowingObjectModal
|
||||||
);
|
);
|
||||||
view.style.order = minutesTotal;
|
view.style.order = order;
|
||||||
return view;
|
return view;
|
||||||
};
|
};
|
||||||
return /* @__PURE__ */ createElement(
|
return /* @__PURE__ */ createElement(
|
||||||
@@ -1699,12 +1702,16 @@
|
|||||||
messageObjects.handleAddition(processObject);
|
messageObjects.handleAddition(processObject);
|
||||||
const objectConverter = (messageObject) => {
|
const objectConverter = (messageObject) => {
|
||||||
const latest = chat.getMostRecentContent(messageObject);
|
const latest = chat.getMostRecentContent(messageObject);
|
||||||
const timeString = latest.time ?? "00:00";
|
const timeString = latest.time || "00:00";
|
||||||
const [hour, minute] = timeString.split(":");
|
const [hour, minute] = timeString.split(":");
|
||||||
const hourInMinutes = parseInt(hour) * 60;
|
const hourInMinutes = parseInt(hour) * 60;
|
||||||
const minutesTotal = parseInt(minute) + hourInMinutes;
|
const minutesTotal = parseInt(minute) + hourInMinutes;
|
||||||
|
const priority = latest.priority ?? 0;
|
||||||
|
const priorityInverse = 100 - priority;
|
||||||
|
const order = `${minutesTotal}${priorityInverse}`;
|
||||||
|
console.log(order);
|
||||||
const view = /* @__PURE__ */ createElement("span", { class: "secondary ellipsis" }, chat.getObjectTitle(messageObject));
|
const view = /* @__PURE__ */ createElement("span", { class: "secondary ellipsis" }, chat.getObjectTitle(messageObject));
|
||||||
view.style.order = minutesTotal;
|
view.style.order = order;
|
||||||
return view;
|
return view;
|
||||||
};
|
};
|
||||||
return /* @__PURE__ */ createElement(
|
return /* @__PURE__ */ createElement(
|
||||||
|
|||||||
@@ -35,10 +35,13 @@ export function DayView(
|
|||||||
messageObject
|
messageObject
|
||||||
) => {
|
) => {
|
||||||
const latest = chat.getMostRecentContent(messageObject);
|
const latest = chat.getMostRecentContent(messageObject);
|
||||||
const timeString = latest.time ?? "00:00";
|
const timeString = latest.time || "00:00";
|
||||||
const [hour, minute] = timeString.split(":");
|
const [hour, minute] = timeString.split(":");
|
||||||
const hourInMinutes = parseInt(hour) * 60;
|
const hourInMinutes = parseInt(hour) * 60;
|
||||||
const minutesTotal = parseInt(minute) + hourInMinutes;
|
const minutesTotal = parseInt(minute) + hourInMinutes;
|
||||||
|
const priority = latest.priority ?? 0;
|
||||||
|
const priorityInverse = 100 - priority;
|
||||||
|
const order = `${minutesTotal}${priorityInverse}`;
|
||||||
|
|
||||||
const view = ObjectEntryView(
|
const view = ObjectEntryView(
|
||||||
chat,
|
chat,
|
||||||
@@ -46,7 +49,7 @@ export function DayView(
|
|||||||
selectedObject,
|
selectedObject,
|
||||||
isShowingObjectModal
|
isShowingObjectModal
|
||||||
);
|
);
|
||||||
view.style.order = minutesTotal;
|
view.style.order = order;
|
||||||
return view;
|
return view;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -45,17 +45,20 @@ export function MiniatureDayView(
|
|||||||
messageObject
|
messageObject
|
||||||
) => {
|
) => {
|
||||||
const latest = chat.getMostRecentContent(messageObject);
|
const latest = chat.getMostRecentContent(messageObject);
|
||||||
const timeString = latest.time ?? "00:00";
|
const timeString = latest.time || "00:00";
|
||||||
const [hour, minute] = timeString.split(":");
|
const [hour, minute] = timeString.split(":");
|
||||||
const hourInMinutes = parseInt(hour) * 60;
|
const hourInMinutes = parseInt(hour) * 60;
|
||||||
const minutesTotal = parseInt(minute) + hourInMinutes;
|
const minutesTotal = parseInt(minute) + hourInMinutes;
|
||||||
|
const priority = latest.priority ?? 0;
|
||||||
|
const priorityInverse = 100 - priority;
|
||||||
|
const order = `${minutesTotal}${priorityInverse}`;
|
||||||
|
|
||||||
const view = (
|
const view = (
|
||||||
<span class="secondary ellipsis">
|
<span class="secondary ellipsis">
|
||||||
{chat.getObjectTitle(messageObject)}
|
{chat.getObjectTitle(messageObject)}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
view.style.order = minutesTotal;
|
view.style.order = order;
|
||||||
return view;
|
return view;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user