yangli/worldshine-redesign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix
All checks were successful
Build And Deploy Main / build-and-deploy (push) Successful in 34s
Details

Browse Source
This commit is contained in:
Lixian Zhou
2026-03-19 10:54:28 -04:00
parent b9f39d6147
commit e2d2f0b392
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/doctemplate.controller.js
View File

@@ -225,6 +225,7 @@ const path = require('path');
var libre = require('libreoffice-convert');
const moment = require("moment-timezone");
const BASE_UPLOAD_DIR = "/www/wwwroot/upload/";
const TARGET_TIMEZONE = "America/New_York";
const resolveTemplateFilePath = (fileUrl = "") => {
if (!fileUrl) return "";
@@ -234,6 +235,13 @@ const resolveTemplateFilePath = (fileUrl = "") => {
return `${__dirname.replace("/controllers", "")}${fileUrl}`;
};
const formatEventTimeForExport = (dateLike, formatPattern) => {
if (!dateLike) return "";
const parsed = moment.utc(dateLike);
if (!parsed.isValid()) return "";
return parsed.tz(TARGET_TIMEZONE).format(formatPattern);
};
exports.createPDFFromDocTemplateName = (req, res) => {
console.log('what', __dirname.replace('/controllers', ''));
@@ -247,7 +255,7 @@ exports.createPDFFromDocTemplateName = (req, res) => {
};
events.forEach((event) => {
docData.events.push({
event_time: moment(event.start_time).format('hh:mm A MM/DD/YYYY dddd'),
event_time: formatEventTimeForExport(event.start_time, 'hh:mm A MM/DD/YYYY dddd'),
client_name: event.data.client_name || '',
client_status: '会员',
//client_dob: event.data.client_birth_date || '',
@@ -408,7 +416,7 @@ exports.createDocFromDocTemplateName = (req, res) => {
};
events.forEach((event) => {
docData.events.push({
event_time: moment(event.start_time).format('hh:mm A MM/DD/YYYY dddd'),
event_time: formatEventTimeForExport(event.start_time, 'hh:mm A MM/DD/YYYY dddd'),
client_name: event.data.client_name || '',
client_status: '会员',
//client_dob: event.data.client_birth_date || '',

12
app/controllers/xlsxtemplate.controller.js
View File

@@ -165,6 +165,7 @@ const path = require('path');
var libre = require('libreoffice-convert');
const moment = require('moment-timezone');
const BASE_UPLOAD_DIR = "/www/wwwroot/upload/";
const TARGET_TIMEZONE = "America/New_York";
const resolveTemplateFilePath = (fileUrl = "") => {
if (!fileUrl) return "";
@@ -174,6 +175,13 @@ const resolveTemplateFilePath = (fileUrl = "") => {
return `${__dirname.replace("/controllers", "")}${fileUrl}`;
};
const formatEventTimeForExport = (dateLike, formatPattern) => {
if (!dateLike) return "";
const parsed = moment.utc(dateLike);
if (!parsed.isValid()) return "";
return parsed.tz(TARGET_TIMEZONE).format(formatPattern);
};
exports.createPDFFromSheetTemplateName = (req, res) => {
console.log('what', __dirname.replace('/controllers', ''));
var inputData = JSON.parse(req.query.inputData);
@@ -210,7 +218,7 @@ exports.createPDFFromSheetTemplateName = (req, res) => {
const clientName = (!!customer?.name_cn && !!event?.data?.client_name && nameShow) || customer?.name_cn || (customer?.lastname && customer?.firstname && `${customer?.lastname}, ${customer?.firstname}`) || event?.data?.client_name;
docData.events.push({
event_time: moment(event?.start_time).format('MM/DD/YYYY hh:mm A'),
event_time: formatEventTimeForExport(event?.start_time, 'MM/DD/YYYY hh:mm A'),
client_name: event?.data?.client_name, // event.data.client_name,
client_status: '会员',
client_dob: event.data.client_birth_date,
@@ -367,7 +375,7 @@ exports.createSheetFromTemplateName = (req, res) => {
const clientName = (customer?.name_cn && event?.data?.client_name && `${event?.data?.client_name} ${customer?.name_cn}`) || customer?.name_cn || (customer?.lastname && customer?.firstname && `${customer?.lastname}, ${customer?.firstname}`) || event?.data?.client_name;
docData.events.push({
event_time: moment(event?.start_time).format('MM/DD/YYYY hh:mm A'),
event_time: formatEventTimeForExport(event?.start_time, 'MM/DD/YYYY hh:mm A'),
client_name: event?.data?.client_name, // event.data.client_name,
client_status: '会员',
client_dob: event.data.client_birth_date,