From ed26bcb7a1aad623a734629efeae79c81c26e47b Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Fri, 12 Jun 2020 09:52:09 +0200
Subject: [PATCH] fix SAR children report broken
---
src/endWeek/slaveAssignmentReport.js | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index d46da830349..42febaf2799 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -321,9 +321,9 @@ App.EndWeek.slaveAssignmentReport = function() {
["Farmyard Report", App.Entity.facilities.farmyard],
["Schoolroom Report", App.Entity.facilities.schoolroom],
["Spa Report", App.Entity.facilities.spa],
- ["Nursery Report", App.Entity.facilities.nursery],
["Servants' Quarters Report", App.Entity.facilities.servantsQuarters],
- ["Children Report", App.Entity.facilities.nursery],
+ ["Nursery Report", App.Entity.facilities.nursery],
+ ["Children Report", "Nursery Children", V.nursery, V.nurseryBabies],
["Incubator Report", App.Entity.facilities.incubator],
["Master Suite Report", App.Entity.facilities.masterSuite],
["Penthouse Report", "The Penthouse"],
@@ -340,7 +340,7 @@ App.EndWeek.slaveAssignmentReport = function() {
entriesNumberInitial: initialPenthouseTotalEmployeesCount,
entriesNumber: _countPenthousePopulation(),
manager: null,
- noSlaves: 0,
+ alwaysExists: 0,
};
} else {
return {
@@ -349,7 +349,7 @@ App.EndWeek.slaveAssignmentReport = function() {
entriesNumberInitial: null,
entriesNumber: ar[3],
manager: null,
- noSlaves: 1,
+ alwaysExists: ar[3] === undefined ? 1 : 0,
};
}
} else {
@@ -359,7 +359,7 @@ App.EndWeek.slaveAssignmentReport = function() {
entriesNumberInitial: initialEmployeesCount[ar[1].desc.baseName],
entriesNumber: ar[1].hostedSlaves,
manager: ar[1].manager,
- noSlaves: 0,
+ alwaysExists: 0,
};
}
}
@@ -375,7 +375,7 @@ App.EndWeek.slaveAssignmentReport = function() {
const header = document.createDocumentFragment();
App.UI.DOM.appendNewElement("span", header, `${stats.name} Report`, "title");
- if (!stats.noSlaves) {
+ if (!stats.alwaysExists) {
// Display the bar with information
if (stats.entriesNumber > 0) {
const diffNum = stats.entriesNumber - stats.entriesNumberInitial;
@@ -395,7 +395,7 @@ App.EndWeek.slaveAssignmentReport = function() {
}
// Is there anyone inside the facility?
- if (stats.entriesNumber > 0 || (stats.manager && stats.manager.currentEmployee) || stats.noSlaves) {
+ if (stats.entriesNumber > 0 || (stats.manager && stats.manager.currentEmployee) || stats.alwaysExists) {
res.append(App.UI.DOM.accordion(header, reportContent, V.useAccordion > 0));
} else {
res.append(App.UI.DOM.accordion(header));
--
GitLab