RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issues in folders display

pull/62/head
Varun Patil 2022-09-16 15:17:37 -07:00
parent eaeb7af274
commit 8ae5c0fc3e
1 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/components/Timeline.vue
View File

@ -114,7 +114,7 @@
<script lang="ts"> <script lang="ts">
import { Component, Watch, Mixins } from 'vue-property-decorator'; import { Component, Watch, Mixins } from 'vue-property-decorator';
import { IDay, IHeadRow, IPhoto, IRow, IRowType, ITick } from "../types"; import { IDay, IFolder, IHeadRow, IPhoto, IRow, IRowType, ITick } from "../types";
import { generateUrl } from '@nextcloud/router' import { generateUrl } from '@nextcloud/router'
import { showError } from '@nextcloud/dialogs' import { showError } from '@nextcloud/dialogs'
import GlobalMixin from '../mixins/GlobalMixin'; import GlobalMixin from '../mixins/GlobalMixin';
@ -425,7 +425,7 @@ export default class Timeline extends Mixins(GlobalMixin) {
} }
/** Get name of header */ /** Get name of header */
getHeadName(head: IRow) { getHeadName(head: IHeadRow) {
// Check cache // Check cache
if (head.name) { if (head.name) {
return head.name; return head.name;
@ -675,30 +675,39 @@ export default class Timeline extends Mixins(GlobalMixin) {
let prevMonth = 0; let prevMonth = 0;
const thisYear = new Date().getFullYear(); const thisYear = new Date().getFullYear();
// Get a new tick
const getTick = (day: IDay, text?: string | number): ITick => {
return {
dayId: day.dayid,
top: currTopRow,
topS: currTopStatic,
topC: 0,
text: text,
};
}
// Itearte over days // Itearte over days
for (const day of this.days) { for (const day of this.days) {
if (day.count === 0) { if (day.count === 0) {
continue; continue;
} }
// Make date string if (Object.values(this.TagDayID).includes(day.dayid)) {
const dateTaken = utils.dayIdToDate(day.dayid); // Blank dash ticks only
this.timelineTicks.push(getTick(day));
} else {
// Make date string
const dateTaken = utils.dayIdToDate(day.dayid);
// Create tick if month changed // Create tick if month changed
const dtYear = dateTaken.getUTCFullYear(); const dtYear = dateTaken.getUTCFullYear();
const dtMonth = dateTaken.getUTCMonth() const dtMonth = dateTaken.getUTCMonth()
if (Number.isInteger(day.dayid) && (dtMonth !== prevMonth || dtYear !== prevYear)) { if (Number.isInteger(day.dayid) && (dtMonth !== prevMonth || dtYear !== prevYear)) {
// Create tick this.timelineTicks.push(getTick(day, (dtYear === prevYear || dtYear === thisYear) ? undefined : dtYear));
this.timelineTicks.push({ }
dayId: day.dayid, prevMonth = dtMonth;
top: currTopRow, prevYear = dtYear;
topS: currTopStatic,
topC: 0,
text: (dtYear === prevYear || dtYear === thisYear) ? undefined : dtYear,
});
} }
prevMonth = dtMonth;
prevYear = dtYear;
currTopStatic += this.heads[day.dayid].size; currTopStatic += this.heads[day.dayid].size;
currTopRow += day.rows.size; currTopRow += day.rows.size;
@ -836,7 +845,16 @@ export default class Timeline extends Mixins(GlobalMixin) {
return; return;
} }
const date = utils.dayIdToDate(this.timelineTicks[idx].dayId); // DayId of current hover
const dayId = this.timelineTicks[idx].dayId
// Special days
if (Object.values(this.TagDayID).includes(dayId)) {
this.timelineHoverCursorText = this.getHeadName(this.heads[dayId]);
return;
}
const date = utils.dayIdToDate(dayId);
this.timelineHoverCursorText = `${utils.getMonthName(date)} ${date.getUTCFullYear()}`; this.timelineHoverCursorText = `${utils.getMonthName(date)} ${date.getUTCFullYear()}`;
} }