@royalschedule/maps 4.0.32 → 4.0.33

package/dist/vKlass/to/schedules.js

@@ -4,8 +4,7 @@ import XLSX from "xlsx";
 
 //#region src/vKlass/to/schedules.ts
 function schedules_default(schedule) {
-	const did = getVertexId(schedule.division, { idKey: "id" });
-	if (!did) throw new Error("division id is undefined");
+	if (!getVertexId(schedule.division, { idKey: "id" })) throw new Error("division id is undefined");
 	const startDate = moment.utc(schedule.division.start).format("YYYY-MM-DD HH:mm:ss");
 	const endDate = moment.utc(schedule.division.end).format("YYYY-MM-DD HH:mm:ss");
 	const personMap = /* @__PURE__ */ new Map();
@@ -23,8 +22,7 @@ function schedules_default(schedule) {
 	const courses = schedule.courses.map((course) => {
 		const group = validateGroup(course.groups);
 		if (!group) return null;
-		const teacherIds = course.teachers?.map((t) => getVertexId(t.to, { idKey: "id" })).filter((id) => id != null) ?? [];
-		const teacherSignatures = teacherIds.map((id) => teacherMap.get(id)).filter((sig) => sig != null);
+		const teacherSignatures = (course.teachers?.map((t) => getVertexId(t.to, { idKey: "id" })).filter((id) => id != null) ?? []).map((id) => teacherMap.get(id)).filter((sig) => sig != null);
 		const courseName = course.displayName || "";
 		const subject = course.subject || "";
 		const membersSSNs = group.members.map((id) => {
@@ -72,20 +70,11 @@ function validateGroup(groups) {
 function formatSSN(ssn) {
 	if (typeof ssn === "number") ssn = ssn.toString();
 	if (typeof ssn !== "string") return "";
-	const regex10 = /^\d{6}-\d{4}$/;
-	if (regex10.test(ssn)) return ssn;
+	if (/^\d{6}-\d{4}$/.test(ssn)) return ssn;
 	ssn = ssn.replace(/\D/g, "");
-	if (ssn.length === 12) {
-		const year = ssn.slice(2, 4);
-		const month = ssn.slice(4, 6);
-		const day = ssn.slice(6, 8);
-		const lastFour = ssn.slice(8);
-		return `${year}${month}${day}-${lastFour}`;
-	} else if (ssn.length === 10) {
-		const datePart = ssn.slice(0, 6);
-		const lastFour = ssn.slice(6);
-		return `${datePart}-${lastFour}`;
-	} else return "";
+	if (ssn.length === 12) return `${ssn.slice(2, 4)}${ssn.slice(4, 6)}${ssn.slice(6, 8)}-${ssn.slice(8)}`;
+	else if (ssn.length === 10) return `${ssn.slice(0, 6)}-${ssn.slice(6)}`;
+	else return "";
 }
 
 //#endregion

package/dist/vKlass/to/schedules.js.map

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","names":["memberIds: string[]"],"sources":["../../../src/vKlass/to/schedules.ts"],"sourcesContent":["import moment from 'moment';\nimport type { Types } from 'mongoose';\nimport XLSX from 'xlsx';\nimport type { Types as CoreTypes } from '../../core/types';\nimport { getVertexId } from '../../core/util';\n\ntype Schedule = {\n  division: CoreTypes.Deep.Division;\n  teachers: CoreTypes.Deep.Teacher[];\n  courses:  CoreTypes.Deep.Course[];\n  persons:  CoreTypes.Deep.Person[];\n};\n\nexport default function (\n  schedule: Schedule,\n): XLSX.WorkBook {\n  const did = getVertexId(schedule.division, { idKey: 'id' });\n  if (!did) throw new Error('division id is undefined');\n\n  // get start and end dates from division in format date + time format: 2024-08-15 00:00:00\n  const startDate = moment.utc(schedule.division.start).format('YYYY-MM-DD HH:mm:ss');\n  const endDate = moment.utc(schedule.division.end).format('YYYY-MM-DD HH:mm:ss');\n\n  // Map persons by id to SSN\n  const personMap = new Map<string, string>();\n  schedule.persons.forEach((p) => {\n    const ssn = p.SSN?.value;\n    const id = getVertexId(p, { idKey: '_id' });\n    if (ssn && id)\n      personMap.set(id, ssn);\n  });\n\n  const teacherMap = new Map<string, string>();\n  schedule.teachers.forEach((t) => {\n    const signature = t.signature;\n    const id = getVertexId(t, { idKey: 'id' });\n    if (signature && id)\n      teacherMap.set(id, signature);\n  });\n\n\n\n  const courses = schedule.courses.map((course) => {\n    const group = validateGroup(course.groups);\n    if (!group) return null;\n\n    const teacherIds = course.teachers?.map((t) => getVertexId(t.to, { idKey: 'id' })).filter((id) => id != null) ?? [];\n    const teacherSignatures = teacherIds.map((id) => teacherMap.get(id)).filter((sig) => sig != null);\n\n    const courseName = course.displayName || '';\n    const subject = course.subject || '';\n\n    const membersSSNs = group.members.map((id) => {\n      return personMap.get(id);\n    }).filter((ssn) => !!ssn);\n\n    if (membersSSNs.length === 0) return null;\n\n    return membersSSNs.map((ssn) => ({\n      Personnummer:       ssn ? formatSSN(ssn) : '',\n      Kurskod:            subject,\n      Benämning:          courseName,\n      Undervisningsgrupp: group.displayName || '',\n      Lärarsignatur:      teacherSignatures ? teacherSignatures.join(',') : '',\n      Poäng:              0,\n      Startdatum:         startDate,\n      Slutdatum:          endDate\n    }));\n\n  }).flat().filter(x => x !== null);\n\n  const wb = XLSX.utils.book_new();\n  XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(courses), 'Kurser');\n\n  return wb;\n}\n\n// Validate that the group is valid and has at least one member\nfunction validateGroup (groups: CoreTypes.Deep.Course['groups']): {\n  members:      string[], // Array of member IDs\n  displayName?: string\n} | null {\n  const group = groups?.at(0)?.to;\n\n  if (!(typeof group === 'object') || !('members' in group)) return null;\n\n  if (!group?.members || group.members.length === 0) return null;\n\n  const memberIds: string[] = [];\n  for (const member of group.members) {\n    const id = (typeof member === 'object' && 'id' in member) ? member.id : member;\n    memberIds.push((id as unknown as (Types.ObjectId | string)).toString());\n  }\n  if (memberIds.length === 0) return null;\n\n  return { members: memberIds, displayName: group.displayName };\n}\n\n/**\n * Formats a Swedish SSN (personnummer) from the standard 12-digit format (YYYYMMDDXXXX) to the common 10-digit format (YYMMDD-XXXX).\n * If the input is already in the 10-digit format, it is returned as is.\n * If the input is invalid, null is returned.\n *\n * @param ssn - The SSN to format, either as a string or number.\n * @returns The formatted SSN in 10-digit format, or null if invalid.\n */\nfunction formatSSN (ssn: string | number): string {\n  if (typeof ssn === 'number') {\n    ssn = ssn.toString();\n  }\n  if (typeof ssn !== 'string') {\n    return '';\n  }\n\n  // Check if already in YYMMDD-XXXX format\n  const regex10 = /^\\d{6}-\\d{4}$/;\n  if (regex10.test(ssn)) {\n    return ssn;\n  }\n\n  // Remove any non-digit characters\n  ssn = ssn.replace(/\\D/g, '');\n\n  if (ssn.length === 12) {\n    // Convert from YYYYMMDDXXXX to YYMMDD-XXXX\n    const year = ssn.slice(2, 4);\n    const month = ssn.slice(4, 6);\n    const day = ssn.slice(6, 8);\n    const lastFour = ssn.slice(8);\n    return `${year}${month}${day}-${lastFour}`;\n  } else if (ssn.length === 10) {\n    // Already in YYMMDDXXXX format, just add the hyphen\n    const datePart = ssn.slice(0, 6);\n    const lastFour = ssn.slice(6);\n    return `${datePart}-${lastFour}`;\n  } else {\n    // Invalid SSN format\n    return '';\n  }\n}"],"mappings":";;;;;AAaA,2BACE,UACe;CACf,MAAM,MAAM,YAAY,SAAS,UAAU,EAAE,OAAO;AACpD,KAAI,CAAC,IAAK,OAAM,IAAI,MAAM;CAG1B,MAAM,YAAY,OAAO,IAAI,SAAS,SAAS,OAAO,OAAO;CAC7D,MAAM,UAAU,OAAO,IAAI,SAAS,SAAS,KAAK,OAAO;CAGzD,MAAM,4BAAY,IAAI;AACtB,UAAS,QAAQ,SAAS,MAAM;EAC9B,MAAM,MAAM,EAAE,KAAK;EACnB,MAAM,KAAK,YAAY,GAAG,EAAE,OAAO;AACnC,MAAI,OAAO,GACT,WAAU,IAAI,IAAI;;CAGtB,MAAM,6BAAa,IAAI;AACvB,UAAS,SAAS,SAAS,MAAM;EAC/B,MAAM,YAAY,EAAE;EACpB,MAAM,KAAK,YAAY,GAAG,EAAE,OAAO;AACnC,MAAI,aAAa,GACf,YAAW,IAAI,IAAI;;CAKvB,MAAM,UAAU,SAAS,QAAQ,KAAK,WAAW;EAC/C,MAAM,QAAQ,cAAc,OAAO;AACnC,MAAI,CAAC,MAAO,QAAO;EAEnB,MAAM,aAAa,OAAO,UAAU,KAAK,MAAM,YAAY,EAAE,IAAI,EAAE,OAAO,SAAS,QAAQ,OAAO,MAAM,SAAS;EACjH,MAAM,oBAAoB,WAAW,KAAK,OAAO,WAAW,IAAI,KAAK,QAAQ,QAAQ,OAAO;EAE5F,MAAM,aAAa,OAAO,eAAe;EACzC,MAAM,UAAU,OAAO,WAAW;EAElC,MAAM,cAAc,MAAM,QAAQ,KAAK,OAAO;AAC5C,UAAO,UAAU,IAAI;KACpB,QAAQ,QAAQ,CAAC,CAAC;AAErB,MAAI,YAAY,WAAW,EAAG,QAAO;AAErC,SAAO,YAAY,KAAK,SAAS;GAC/B,cAAoB,MAAM,UAAU,OAAO;GAC3C,SAAoB;GACpB,WAAoB;GACpB,oBAAoB,MAAM,eAAe;GACzC,eAAoB,oBAAoB,kBAAkB,KAAK,OAAO;GACtE,OAAoB;GACpB,YAAoB;GACpB,WAAoB;;IAGrB,OAAO,QAAO,MAAK,MAAM;CAE5B,MAAM,KAAK,KAAK,MAAM;AACtB,MAAK,MAAM,kBAAkB,IAAI,KAAK,MAAM,cAAc,UAAU;AAEpE,QAAO;;AAIT,SAAS,cAAe,QAGf;CACP,MAAM,QAAQ,QAAQ,GAAG,IAAI;AAE7B,KAAI,EAAE,OAAO,UAAU,aAAa,EAAE,aAAa,OAAQ,QAAO;AAElE,KAAI,CAAC,OAAO,WAAW,MAAM,QAAQ,WAAW,EAAG,QAAO;CAE1D,MAAMA,YAAsB;AAC5B,MAAK,MAAM,UAAU,MAAM,SAAS;EAClC,MAAM,KAAM,OAAO,WAAW,YAAY,QAAQ,SAAU,OAAO,KAAK;AACxE,YAAU,KAAM,GAA4C;;AAE9D,KAAI,UAAU,WAAW,EAAG,QAAO;AAEnC,QAAO;EAAE,SAAS;EAAW,aAAa,MAAM;;;;;;;;;;;AAWlD,SAAS,UAAW,KAA8B;AAChD,KAAI,OAAO,QAAQ,SACjB,OAAM,IAAI;AAEZ,KAAI,OAAO,QAAQ,SACjB,QAAO;CAIT,MAAM,UAAU;AAChB,KAAI,QAAQ,KAAK,KACf,QAAO;AAIT,OAAM,IAAI,QAAQ,OAAO;AAEzB,KAAI,IAAI,WAAW,IAAI;EAErB,MAAM,OAAO,IAAI,MAAM,GAAG;EAC1B,MAAM,QAAQ,IAAI,MAAM,GAAG;EAC3B,MAAM,MAAM,IAAI,MAAM,GAAG;EACzB,MAAM,WAAW,IAAI,MAAM;AAC3B,SAAO,GAAG,OAAO,QAAQ,IAAI,GAAG;YACvB,IAAI,WAAW,IAAI;EAE5B,MAAM,WAAW,IAAI,MAAM,GAAG;EAC9B,MAAM,WAAW,IAAI,MAAM;AAC3B,SAAO,GAAG,SAAS,GAAG;OAGtB,QAAO"}
+{"version":3,"file":"schedules.js","names":["memberIds: string[]"],"sources":["../../../src/vKlass/to/schedules.ts"],"sourcesContent":["import moment from 'moment';\nimport type { Types } from 'mongoose';\nimport XLSX from 'xlsx';\nimport type { Types as CoreTypes } from '../../core/types';\nimport { getVertexId } from '../../core/util';\n\ntype Schedule = {\n  division: CoreTypes.Deep.Division;\n  teachers: CoreTypes.Deep.Teacher[];\n  courses:  CoreTypes.Deep.Course[];\n  persons:  CoreTypes.Deep.Person[];\n};\n\nexport default function (\n  schedule: Schedule,\n): XLSX.WorkBook {\n  const did = getVertexId(schedule.division, { idKey: 'id' });\n  if (!did) throw new Error('division id is undefined');\n\n  // get start and end dates from division in format date + time format: 2024-08-15 00:00:00\n  const startDate = moment.utc(schedule.division.start).format('YYYY-MM-DD HH:mm:ss');\n  const endDate = moment.utc(schedule.division.end).format('YYYY-MM-DD HH:mm:ss');\n\n  // Map persons by id to SSN\n  const personMap = new Map<string, string>();\n  schedule.persons.forEach((p) => {\n    const ssn = p.SSN?.value;\n    const id = getVertexId(p, { idKey: '_id' });\n    if (ssn && id)\n      personMap.set(id, ssn);\n  });\n\n  const teacherMap = new Map<string, string>();\n  schedule.teachers.forEach((t) => {\n    const signature = t.signature;\n    const id = getVertexId(t, { idKey: 'id' });\n    if (signature && id)\n      teacherMap.set(id, signature);\n  });\n\n\n\n  const courses = schedule.courses.map((course) => {\n    const group = validateGroup(course.groups);\n    if (!group) return null;\n\n    const teacherIds = course.teachers?.map((t) => getVertexId(t.to, { idKey: 'id' })).filter((id) => id != null) ?? [];\n    const teacherSignatures = teacherIds.map((id) => teacherMap.get(id)).filter((sig) => sig != null);\n\n    const courseName = course.displayName || '';\n    const subject = course.subject || '';\n\n    const membersSSNs = group.members.map((id) => {\n      return personMap.get(id);\n    }).filter((ssn) => !!ssn);\n\n    if (membersSSNs.length === 0) return null;\n\n    return membersSSNs.map((ssn) => ({\n      Personnummer:       ssn ? formatSSN(ssn) : '',\n      Kurskod:            subject,\n      Benämning:          courseName,\n      Undervisningsgrupp: group.displayName || '',\n      Lärarsignatur:      teacherSignatures ? teacherSignatures.join(',') : '',\n      Poäng:              0,\n      Startdatum:         startDate,\n      Slutdatum:          endDate\n    }));\n\n  }).flat().filter(x => x !== null);\n\n  const wb = XLSX.utils.book_new();\n  XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(courses), 'Kurser');\n\n  return wb;\n}\n\n// Validate that the group is valid and has at least one member\nfunction validateGroup (groups: CoreTypes.Deep.Course['groups']): {\n  members:      string[], // Array of member IDs\n  displayName?: string\n} | null {\n  const group = groups?.at(0)?.to;\n\n  if (!(typeof group === 'object') || !('members' in group)) return null;\n\n  if (!group?.members || group.members.length === 0) return null;\n\n  const memberIds: string[] = [];\n  for (const member of group.members) {\n    const id = (typeof member === 'object' && 'id' in member) ? member.id : member;\n    memberIds.push((id as unknown as (Types.ObjectId | string)).toString());\n  }\n  if (memberIds.length === 0) return null;\n\n  return { members: memberIds, displayName: group.displayName };\n}\n\n/**\n * Formats a Swedish SSN (personnummer) from the standard 12-digit format (YYYYMMDDXXXX) to the common 10-digit format (YYMMDD-XXXX).\n * If the input is already in the 10-digit format, it is returned as is.\n * If the input is invalid, null is returned.\n *\n * @param ssn - The SSN to format, either as a string or number.\n * @returns The formatted SSN in 10-digit format, or null if invalid.\n */\nfunction formatSSN (ssn: string | number): string {\n  if (typeof ssn === 'number') {\n    ssn = ssn.toString();\n  }\n  if (typeof ssn !== 'string') {\n    return '';\n  }\n\n  // Check if already in YYMMDD-XXXX format\n  const regex10 = /^\\d{6}-\\d{4}$/;\n  if (regex10.test(ssn)) {\n    return ssn;\n  }\n\n  // Remove any non-digit characters\n  ssn = ssn.replace(/\\D/g, '');\n\n  if (ssn.length === 12) {\n    // Convert from YYYYMMDDXXXX to YYMMDD-XXXX\n    const year = ssn.slice(2, 4);\n    const month = ssn.slice(4, 6);\n    const day = ssn.slice(6, 8);\n    const lastFour = ssn.slice(8);\n    return `${year}${month}${day}-${lastFour}`;\n  } else if (ssn.length === 10) {\n    // Already in YYMMDDXXXX format, just add the hyphen\n    const datePart = ssn.slice(0, 6);\n    const lastFour = ssn.slice(6);\n    return `${datePart}-${lastFour}`;\n  } else {\n    // Invalid SSN format\n    return '';\n  }\n}"],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@royalschedule/maps",
   "description": "",
-  "version": "4.0.32",
+  "version": "4.0.33",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",