diff --git a/src/endWeek/reports/schoolroomReport.js b/src/endWeek/reports/schoolroomReport.js index 173cc97ac63321161d5eb2a4a9a90373dcc25029..bdd44d338120afc798d7e6ee2bce75aa40af46aa 100644 --- a/src/endWeek/reports/schoolroomReport.js +++ b/src/endWeek/reports/schoolroomReport.js @@ -247,11 +247,6 @@ App.EndWeek.schoolroomReport = function() { } } slaveEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is studying in ${V.schoolroomName}${leaderTraining}.`)); - if (tutorForSlave(slave) && slave.skill[uncapFirstChar(tutorForSlave(slave))] < Constant.MASTERED_XP) { - const trainingPercentage = (slave.skill[uncapFirstChar(tutorForSlave(slave))] / Constant.MASTERED_XP) * 100; - slaveEntry.append(` ${He} is currently ${Math.round(trainingPercentage)}% through training and should be finished in approximately ${numberWithPluralOne(Math.round(Constant.MASTERED_XP / trainingPercentage), "week")}.`); - } - App.Events.addNode(slaveEntry, [He, App.SlaveAssignment.takeClasses(slave)], "div", ["indent"]); slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); App.SlaveAssignment.appendSlaveArt(artSpan, slave); diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js index 416b698764ea06d5047e7a6a3617592dbb180b28..bd0e5255abf91f8e9b83efd6636c9cc4ed792f25 100644 --- a/src/endWeek/saTakeClasses.js +++ b/src/endWeek/saTakeClasses.js @@ -734,6 +734,10 @@ App.SlaveAssignment.takeClasses = function saTakeClasses(slave) { default: r += `tutorLessons ERROR unknown skill`; } + if (tutorForSlave(slave)) { + const trainingPercentage = ((slave.skill[uncapFirstChar(tutorForSlave(slave))] || slave.skill[tutorForSlave(slave)]) / Constant.MASTERED_XP) * 100; + r += ` ${He} is currently ${Math.round(trainingPercentage)}% through training and should be finished in approximately ${numberWithPluralOne(Math.round(Constant.MASTERED_XP / lessonSkillIncrease(slave)), "week")}.`; + } } /**