From 0ab9cd91e5f63a3d134730e11b2e0e5ce921fde8 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Thu, 14 Jan 2021 01:31:09 -0800
Subject: [PATCH] When reassigning slaves from the cellblock, terminate the
report early (as we do for schoolroom and clinic), since the standard report
should be run at her new assignment.
---
src/endWeek/reports/cellblockReport.js | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/endWeek/reports/cellblockReport.js b/src/endWeek/reports/cellblockReport.js
index b5148073f9d..8e05369dcb7 100644
--- a/src/endWeek/reports/cellblockReport.js
+++ b/src/endWeek/reports/cellblockReport.js
@@ -306,16 +306,21 @@ App.EndWeek.cellblockReport = function() {
confinedResults = App.SlaveAssignment.stayConfined(slave);
App.Events.addNode(slaveEntry, [He, confinedResults.text], "div", "indent");
+ if (confinedResults.broken) {
+ brokenSlaves++;
+ continue; // slave has been reassigned; remaining report will run at her new assignment
+ }
slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false));
} else {
// discard return values silently
App.SlaveAssignment.choosesOwnJob(slave);
confinedResults = App.SlaveAssignment.stayConfined(slave);
+ if (confinedResults.broken) {
+ brokenSlaves++;
+ continue; // slave has been reassigned; remaining report will run at her new assignment
+ }
App.SlaveAssignment.standardSlaveReport(slave, true);
}
- if (confinedResults.broken) {
- brokenSlaves++;
- }
}
if (softenedQuirks || brokenSlaves) {
r = [];
--
GitLab