fix: teacher name format, non-bold total, total row spacing, year-level show/custom/smart settings
This commit is contained in:
@@ -56,6 +56,44 @@
|
||||
const last = parts.pop();
|
||||
return last + ', ' + parts.join(' ');
|
||||
}
|
||||
// Format a faculty/teacher name to match the official PDF's style:
|
||||
// "First [MiddleInitial] Last" (no comma). Handles a source like
|
||||
// "Surname, First Middle" by dropping full middle names while keeping
|
||||
// honorifics/titles (e.g. FR.) and single-letter middle initials.
|
||||
const HONORIFICS = new Set(['FR', 'REV', 'DR', 'SR', 'BR', 'PROF', 'ENGR', 'ATTY', 'HON', 'MR', 'MS', 'MRS', 'BRO', 'SIS']);
|
||||
function formatTeacher(name) {
|
||||
let v = String(name || '').trim();
|
||||
if (!v) return v;
|
||||
let surname = '', given = [];
|
||||
if (/,/.test(v)) {
|
||||
const idx = v.lastIndexOf(',');
|
||||
surname = v.slice(0, idx).trim();
|
||||
given = v.slice(idx + 1).trim().split(/\s+/).filter(Boolean);
|
||||
} else {
|
||||
const tok = v.split(/\s+/).filter(Boolean);
|
||||
if (tok.length === 0) return v;
|
||||
if (tok.length === 1) return v;
|
||||
given = tok.slice(0, -1);
|
||||
surname = tok[tok.length - 1];
|
||||
}
|
||||
const out = [];
|
||||
let seenFirstName = false;
|
||||
for (const tok of given) {
|
||||
const bare = tok.replace(/\.$/, '').toUpperCase();
|
||||
const isTitle = HONORIFICS.has(bare);
|
||||
const isInitial = tok.length === 1 || (bare.length === 1 && /\.$/.test(tok));
|
||||
if (isTitle || isInitial) {
|
||||
out.push(tok);
|
||||
} else if (!seenFirstName) {
|
||||
out.push(tok);
|
||||
seenFirstName = true;
|
||||
}
|
||||
// full middle names (after the first name) are dropped
|
||||
}
|
||||
if (surname) out.push(surname);
|
||||
return out.join(' ');
|
||||
}
|
||||
|
||||
function wrapLines(text, font, size, maxWidth) {
|
||||
const out = [];
|
||||
String(text == null ? '' : text).split(/\n/).forEach((seg) => {
|
||||
@@ -250,7 +288,11 @@
|
||||
// Student info row, laid out in fixed zones across the page (matching the
|
||||
// reference): ID (bold) left, name at ~100, program at ~338, and
|
||||
// "Year Level: N" right-aligned to the right content edge (575.3).
|
||||
const yearLevelText = header.yearLevel ? 'Year Level: ' + header.yearLevel : '';
|
||||
// Year Level is shown by default; the extension can hide it or override the
|
||||
// value via settings (header.showYearLevel / header.yearLevel).
|
||||
const yearLevelText = (header.showYearLevel !== false && header.yearLevel)
|
||||
? 'Year Level: ' + header.yearLevel
|
||||
: '';
|
||||
if (header.studentId) page.drawText(header.studentId, { x: margin, y, size: 9, font: bold, color: black });
|
||||
if (header.fullName) page.drawText(formatFullName(header.fullName), { x: 100, y, size: 9, font, color: black });
|
||||
if (header.program) page.drawText(compactProgram(header.program), { x: 338, y, size: 9, font, color: black });
|
||||
@@ -401,7 +443,7 @@
|
||||
courseCode: course.courseCode,
|
||||
description: course.description,
|
||||
schedule: formatSchedule(course.schedule),
|
||||
teacher: course.teacher || course.faculty,
|
||||
teacher: formatTeacher(course.teacher || course.faculty),
|
||||
units: course.units,
|
||||
status: course.status
|
||||
};
|
||||
@@ -413,14 +455,14 @@
|
||||
page = doc.addPage([612, 792]);
|
||||
y = 792 - 10;
|
||||
}
|
||||
y -= 12;
|
||||
if (data.totalUnits) {
|
||||
// Total sits under the UNITS column, centered within it (matches reference).
|
||||
// Total sits one standard row height below the last course row (matching
|
||||
// the reference, which has a ~24.5pt gap), centered within the UNITS col.
|
||||
const unitsCol = cols[4];
|
||||
const w = bold.widthOfTextAtSize(data.totalUnits, 8);
|
||||
const w = font.widthOfTextAtSize(data.totalUnits, 8);
|
||||
// Short underline above the total, spanning the UNITS column.
|
||||
hline(unitsCol.x, unitsCol.x + unitsCol.w, y + 9);
|
||||
page.drawText(data.totalUnits, { x: unitsCol.x + (unitsCol.w - w) / 2, y, size: 8, font: bold, color: black });
|
||||
page.drawText(data.totalUnits, { x: unitsCol.x + (unitsCol.w - w) / 2, y, size: 8, font, color: black });
|
||||
y -= 12;
|
||||
}
|
||||
hline(margin, margin + contentWidth, y);
|
||||
@@ -432,5 +474,5 @@
|
||||
return doc.save(); // returns Promise<Uint8Array>
|
||||
}
|
||||
|
||||
return { buildStudyLoadPdf, compactProgram, deriveDateRange, formatSchedule, formatFullName, truncateToWidth };
|
||||
return { buildStudyLoadPdf, compactProgram, deriveDateRange, formatSchedule, formatFullName, formatTeacher, truncateToWidth };
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user