Hanuka update

1. Use official badges for app store & play store
2. Introduce Hanuka flyer in our new tall-design. Filled with RYY lighting and RDY watching
3. RDY in Rahimi flyer gets glima
4. Rahimi Daily Halacha upgrades. Remade WhatsApp logo, restored opaque-bg phone number & whatsapp text filled in
5. Import Visual Sunrise in the ics & excel workers. Unused in ICS at the moment
6. Title file properly for Excel
7. Make year rendering in the flyers handle other locales & add year rendering support
8. Change name of the Kuntress of כי יזרח השמש

_includes/modals/mobile.html

@@ -8,7 +8,7 @@ <h3 class="modal-title">Mobile App downloads</h3>
 			<div class="modal-body">
 				<p>Get <i>Zemanim</i> on the go with our mobile app, available for Android and iOS devices!</p>
                 <div style="text-align: center;">
-                    <a href="https://apps.apple.com/app/rabbi-ovadiah-yosef-calendar/id6448838987"><img src="/assets/images/app-store.png" style="width: 25%;" loading="lazy"></a>
+                    <a href="https://apps.apple.com/app/rabbi-ovadiah-yosef-calendar/id6448838987"><img src="/assets/images/Download_on_the_App_Store_Badge_US-UK_RGB_blk_092917.svg" style="width: 25%;" loading="lazy"></a>
                     <a href="https://play.google.com/store/apps/details?id=com.EJ.ROvadiahYosefCalendar"><img src="/assets/images/google-play-store-8-1-73-apk.png" style="width: 25%;" loading="lazy"></a><br>
                     <div class="d-flex justify-content-center mt-1" style="gap: 1rem; color: white;">
                         <a href="https://apps.apple.com/app/rabbi-ovadiah-yosef-calendar/id6448838987" style="display: block; border-radius: .5rem; background: black; width: 25%; padding: .5rem;">

assets/js/features/excelPrepare.js

@@ -12,7 +12,7 @@ import WebsiteCalendar from "../WebsiteCalendar.js";
  * @param {boolean} isIsrael
  * @param {{ [s: string]: { function: string|null; yomTovInclusive: string|null; luachInclusive: "degrees"|"seasonal"|null; condition: string|null; title: { "en-et": string; en: string; hb: string; }}; }} zmanList
  * @param {boolean} monthView
- * @param {{ language: "en-et" | "en" | "he"; timeFormat: "h11" | "h12" | "h23" | "h24"; seconds: boolean; zmanInfoSettings: Parameters<typeof jCal.getZmanimInfo>[3]; calcConfig: Parameters<OhrHachaimZmanim["configSettings"]>; }} funcSettings
+ * @param {{ language: "en-et" | "en" | "he"; timeFormat: "h11" | "h12" | "h23" | "h24"; seconds: boolean; zmanInfoSettings: Parameters<typeof jCal.getZmanimInfo>[3]; calcConfig: Parameters<OhrHachaimZmanim["configSettings"]>; netzTimes: number[] }} funcSettings
  */
 export default function spreadSheetExport (amudehHoraahZman, plainDateParams, geoLocationData, useElevation, isIsrael, zmanList, monthView=true, funcSettings) {
 	const baseDate = new Temporal.PlainDate(...plainDateParams).with({ day: 1 })
@@ -24,20 +24,41 @@ export default function spreadSheetExport (amudehHoraahZman, plainDateParams, ge
 	calc.setDate(baseDate);
 	calc.configSettings(...funcSettings.calcConfig);
 
+	const vNetz = funcSettings.netzTimes.map((/** @type {number} */ value) => Temporal.Instant
+		.fromEpochSeconds(value)
+		.toZonedDateTimeISO(geoLocation.getTimeZone())
+	);
+
 	const events = [];
 	for (let index = 1; index <= jCal.getDate().daysInMonth; index++) {
+		const regularNetz = calc.getNetz();
+
+		// @ts-ignore
+		let seeSun;
+		if (vNetz)
+			seeSun = vNetz.find(zDT => Math.abs(regularNetz.until(zDT).total('minutes')) <= 6)
+
+		// @ts-ignore
+		function formatTime(entry) {
+			// @ts-ignore
+			const time = (entry.function == 'getNetz' && seeSun ? seeSun : entry.luxonObj)
+			return '=TIME(' + [time.hour, time.minute, time.second].join(', ') + ')'
+		}
+
 		const dailyZmanim = Object.values(jCal.getZmanimInfo(true, calc, zmanList, funcSettings.zmanInfoSettings))
 			.filter(entry => entry.display == 1)
 			.map(entry => [
 				entry.function || (entry.title["en"].startsWith("Candle Lighting") ? "getCandleLighting" : ""),
 				{t: "d", v: new Date(entry.luxonObj.epochMilliseconds),
-				f: `=TIME(${entry.luxonObj.hour}, ${entry.luxonObj.minute}, ${entry.luxonObj.second})`, z:
+				f: formatTime(entry), z:
 					"h" + (["h23", "h24"].includes(funcSettings.timeFormat) ? "h" : "")
-					+ ":mm" + (funcSettings.seconds ? ":ss" : "") + (["h11", "h12"].includes(funcSettings.timeFormat) ? " AM/PM" : "")}
+					// @ts-ignore
+					+ ":mm" + (funcSettings.seconds || (entry.function == "getNetz" && seeSun) ? ":ss" : "")
+					+ (["h11", "h12"].includes(funcSettings.timeFormat) ? " AM/PM" : "")}
 			])
 
 		const row = Object.fromEntries(
-			[['DATE', {t: "s", v: new Date(), f: `=DATE(${jCal.getDate().year}, ${jCal.getDate().month}, ${jCal.getDate().day})`, z: "yyyy-mm-dd"}]]
+			[['DATE', {t: "s", v: "date", f: `=DATE(${jCal.getDate().year}, ${jCal.getDate().month}, ${jCal.getDate().day})`, z: "yyyy-mm-dd"}]]
 			// @ts-ignore
 			.concat(dailyZmanim)
 		);

assets/js/features/print-web-worker.js

@@ -616,15 +616,18 @@ function messageHandler (x) {
 				div.lastElementChild.classList.add("omerText");
 				break;
 			case 'getNetz':
-				let seeSun;
-				if (vNetz)
-					seeSun = vNetz.find(zDT => Math.abs(zmanCalc.getNetz().until(zDT).total('minutes')) <= 6)
-
-				if (seeSun)
-					renderZmanInDiv(seeSun, {dtF: [defaulTF[0], {...defaulTF[1], second: '2-digit'}], hideAMPM: true})
-				else
-					renderZmanInDiv(zmanCalc.getNetz())
-
+				const rZIDoptions = {dtF: defaulTF, hideAMPM: true};
+
+				let sunriseTime = zmanCalc.getNetz();
+				if (vNetz) {
+					const useVNetz = vNetz.find(zDT => Math.abs(sunriseTime.until(zDT).total('minutes')) <= 6);
+					if (useVNetz) {
+						sunriseTime = useVNetz;
+						rZIDoptions.dtF = [defaulTF[0], {...defaulTF[1], second: '2-digit'}];
+					}
+				}
+
+				renderZmanInDiv(sunriseTime, rZIDoptions);	
 				break;
 			case 'getSofZmanShmaGRA':
 				renderZmanInDiv(zmanCalc.getSofZmanShmaGRA())