steve
/
sunrise-cms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle missing preneed order number

deepsource-autofix-76c6eb20
Dan Gowans 2022-09-08 16:00:32 -04:00
parent ccd57cea82
commit 55addc1085
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
temp/legacy.importFromCSV.js
View File

@ -20,9 +20,9 @@ import { addWorkOrderLot } from "../helpers/lotOccupancyDB/addWorkOrderLot.js";
import { addWorkOrderLotOccupancy } from "../helpers/lotOccupancyDB/addWorkOrderLotOccupancy.js"; import { addWorkOrderLotOccupancy } from "../helpers/lotOccupancyDB/addWorkOrderLotOccupancy.js";
import { getWorkOrder, getWorkOrderByWorkOrderNumber } from "../helpers/lotOccupancyDB/getWorkOrder.js"; import { getWorkOrder, getWorkOrderByWorkOrderNumber } from "../helpers/lotOccupancyDB/getWorkOrder.js";
import { reopenWorkOrder } from "../helpers/lotOccupancyDB/reopenWorkOrder.js"; import { reopenWorkOrder } from "../helpers/lotOccupancyDB/reopenWorkOrder.js";
import { addWorkOrderMilestone } from "../helpers/lotOccupancyDB/addWorkOrderMilestone.js";
import { closeWorkOrder } from "../helpers/lotOccupancyDB/closeWorkOrder.js";
import { dateIntegerToString, dateToString } from "@cityssm/expressjs-server-js/dateTimeFns.js"; import { dateIntegerToString, dateToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import addWorkOrderMilestone from "../helpers/lotOccupancyDB/addWorkOrderMilestone.js";
import closeWorkOrder from "../helpers/lotOccupancyDB/closeWorkOrder.js";
const user = { const user = {
user: { user: {
userName: "import.unix", userName: "import.unix",
@ -237,7 +237,7 @@ function importFromMasterCSV() {
} }
let preneedOccupancyStartDateString; let preneedOccupancyStartDateString;
let preneedLotOccupancyId; let preneedLotOccupancyId;
if (masterRow.CM_PRENEED_ORDER) { if (masterRow.CM_PRENEED_ORDER || masterRow.CM_STATUS === "P") {
preneedOccupancyStartDateString = formatDateString(masterRow.CM_PURCHASE_YR, masterRow.CM_PURCHASE_MON, masterRow.CM_PURCHASE_DAY); preneedOccupancyStartDateString = formatDateString(masterRow.CM_PURCHASE_YR, masterRow.CM_PURCHASE_MON, masterRow.CM_PURCHASE_DAY);
let occupancyEndDateString = ""; let occupancyEndDateString = "";
if (masterRow.CM_INTERMENT_YR !== "" && if (masterRow.CM_INTERMENT_YR !== "" &&

8
temp/legacy.importFromCSV.ts
View File

@ -44,14 +44,16 @@ import {
import { reopenWorkOrder } from "../helpers/lotOccupancyDB/reopenWorkOrder.js"; import { reopenWorkOrder } from "../helpers/lotOccupancyDB/reopenWorkOrder.js";
import { addWorkOrderMilestone } from "../helpers/lotOccupancyDB/addWorkOrderMilestone.js";
import { closeWorkOrder } from "../helpers/lotOccupancyDB/closeWorkOrder.js";
import { import {
dateIntegerToString, dateIntegerToString,
dateToString dateToString
} from "@cityssm/expressjs-server-js/dateTimeFns.js"; } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import type * as recordTypes from "../types/recordTypes"; import type * as recordTypes from "../types/recordTypes";
import addWorkOrderMilestone from "../helpers/lotOccupancyDB/addWorkOrderMilestone.js";
import closeWorkOrder from "../helpers/lotOccupancyDB/closeWorkOrder.js";
interface MasterRecord { interface MasterRecord {
CM_SYSREC: string; CM_SYSREC: string;
@ -505,7 +507,7 @@ function importFromMasterCSV() {
let preneedOccupancyStartDateString: string; let preneedOccupancyStartDateString: string;
let preneedLotOccupancyId: number; let preneedLotOccupancyId: number;
if (masterRow.CM_PRENEED_ORDER) { if (masterRow.CM_PRENEED_ORDER || masterRow.CM_STATUS === "P") {
preneedOccupancyStartDateString = formatDateString( preneedOccupancyStartDateString = formatDateString(
masterRow.CM_PURCHASE_YR, masterRow.CM_PURCHASE_YR,
masterRow.CM_PURCHASE_MON, masterRow.CM_PURCHASE_MON,