This commit is contained in:
2021-08-17 21:31:15 +00:00
parent d473d09118
commit f6a27f781b

View File

@@ -3401,12 +3401,12 @@ namespace AyaNova.PlugIn.V8
d.customerReferenceNumber = c.CustomerReferenceNumber; d.customerReferenceNumber = c.CustomerReferenceNumber;
d.customerContactName = c.CustomerContactName; d.customerContactName = c.CustomerContactName;
d.createdDate = util.DateToV8(c.Created, true); d.createdDate = util.DateToV8(c.Created, true);
d.preparedById= Getv7v8IdMap(c.WorkorderQuote.PreparedByID,"quote prepared by id"); d.preparedById = Getv7v8IdMap(c.WorkorderQuote.PreparedByID, "quote prepared by id");
d.introduction = c.WorkorderQuote.Introduction; d.introduction = c.WorkorderQuote.Introduction;
d.requested=util.DateToV8(c.WorkorderQuote.QuoteRequestDate); d.requested = util.DateToV8(c.WorkorderQuote.QuoteRequestDate);
d.validUntil=util.DateToV8(c.WorkorderQuote.ValidUntilDate); d.validUntil = util.DateToV8(c.WorkorderQuote.ValidUntilDate);
d.submitted=util.DateToV8(c.WorkorderQuote.DateSubmitted); d.submitted = util.DateToV8(c.WorkorderQuote.DateSubmitted);
d.approved=util.DateToV8(c.WorkorderQuote.DateApproved); d.approved = util.DateToV8(c.WorkorderQuote.DateApproved);
d.contractId = Getv7v8IdMapNullOk(c.ContractIDResolved()); d.contractId = Getv7v8IdMapNullOk(c.ContractIDResolved());
d.lastStatusId = (int)c.WorkorderQuote.QuoteStatus; d.lastStatusId = (int)c.WorkorderQuote.QuoteStatus;
@@ -3730,22 +3730,26 @@ namespace AyaNova.PlugIn.V8
d.excludeDaysOfWeek = util.AyaDaysOfWeek.Monday | util.AyaDaysOfWeek.Tuesday | util.AyaDaysOfWeek.Thursday | util.AyaDaysOfWeek.Friday | util.AyaDaysOfWeek.Saturday | util.AyaDaysOfWeek.Sunday; d.excludeDaysOfWeek = util.AyaDaysOfWeek.Monday | util.AyaDaysOfWeek.Tuesday | util.AyaDaysOfWeek.Thursday | util.AyaDaysOfWeek.Friday | util.AyaDaysOfWeek.Saturday | util.AyaDaysOfWeek.Sunday;
break; break;
case AyaDayOfWeek.Thursday: case AyaDayOfWeek.Thursday:
d.excludeDaysOfWeek = util.AyaDaysOfWeek.Monday | util.AyaDaysOfWeek.Tuesday | util.AyaDaysOfWeek.Wednesday | util.AyaDaysOfWeek.Friday | util.AyaDaysOfWeek.Saturday | util.AyaDaysOfWeek.Sunday; d.excludeDaysOfWeek = util.AyaDaysOfWeek.Monday | util.AyaDaysOfWeek.Tuesday | util.AyaDaysOfWeek.Wednesday | util.AyaDaysOfWeek.Friday | util.AyaDaysOfWeek.Saturday | util.AyaDaysOfWeek.Sunday;
break; break;
case AyaDayOfWeek.Friday: case AyaDayOfWeek.Friday:
d.excludeDaysOfWeek = util.AyaDaysOfWeek.Monday | util.AyaDaysOfWeek.Tuesday | util.AyaDaysOfWeek.Wednesday | util.AyaDaysOfWeek.Thursday | util.AyaDaysOfWeek.Saturday | util.AyaDaysOfWeek.Sunday; d.excludeDaysOfWeek = util.AyaDaysOfWeek.Monday | util.AyaDaysOfWeek.Tuesday | util.AyaDaysOfWeek.Wednesday | util.AyaDaysOfWeek.Thursday | util.AyaDaysOfWeek.Saturday | util.AyaDaysOfWeek.Sunday;
break; break;
case AyaDayOfWeek.Saturday: case AyaDayOfWeek.Saturday:
d.excludeDaysOfWeek = util.AyaDaysOfWeek.Monday | util.AyaDaysOfWeek.Tuesday | util.AyaDaysOfWeek.Wednesday | util.AyaDaysOfWeek.Thursday | util.AyaDaysOfWeek.Friday | util.AyaDaysOfWeek.Sunday; d.excludeDaysOfWeek = util.AyaDaysOfWeek.Monday | util.AyaDaysOfWeek.Tuesday | util.AyaDaysOfWeek.Wednesday | util.AyaDaysOfWeek.Thursday | util.AyaDaysOfWeek.Friday | util.AyaDaysOfWeek.Sunday;
break; break;
case AyaDayOfWeek.Sunday: case AyaDayOfWeek.Sunday:
d.excludeDaysOfWeek = util.AyaDaysOfWeek.Monday | util.AyaDaysOfWeek.Tuesday | util.AyaDaysOfWeek.Wednesday | util.AyaDaysOfWeek.Thursday | util.AyaDaysOfWeek.Friday | util.AyaDaysOfWeek.Saturday ; d.excludeDaysOfWeek = util.AyaDaysOfWeek.Monday | util.AyaDaysOfWeek.Tuesday | util.AyaDaysOfWeek.Wednesday | util.AyaDaysOfWeek.Thursday | util.AyaDaysOfWeek.Friday | util.AyaDaysOfWeek.Saturday;
break; break;
} }
d.active = c.WorkorderPreventiveMaintenance.Active; d.active = c.WorkorderPreventiveMaintenance.Active;
d.nextServiceDate = util.DateToV8(c.WorkorderPreventiveMaintenance.NextServiceDate, true); d.nextServiceDate = util.DateToV8(c.WorkorderPreventiveMaintenance.NextServiceDate, true);
d.repeatUnit = (int)c.WorkorderPreventiveMaintenance.GenerateSpanUnit;
d.generateBeforeUnit = (int)c.WorkorderPreventiveMaintenance.ThresholdSpanUnit;
d.repeatInterval = c.WorkorderPreventiveMaintenance.GenerateSpan;
d.generateBeforeInterval = c.WorkorderPreventiveMaintenance.ThresholdSpan;
d.stopGeneratingDate = util.DateToV8(c.WorkorderPreventiveMaintenance.StopGeneratingDate);
var client = c.uiClient; var client = c.uiClient;
if (client != null) if (client != null)