diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js
index 961b7914cb47d4a1579b811a041d8b11a0576fd9..72f9ed67cd24ed2d487283ee37604cb77175008b 100644
--- a/src/js/utilsFC.js
+++ b/src/js/utilsFC.js
@@ -1287,15 +1287,15 @@ window.repFormat = function(s) {
} else if (weight === 0) {
return "0 rep";
} else if (weight < -0.60) {
- return `<span class="red">----- rep</span>`;
+ return `<span class="red">−−−−− rep</span>`;
} else if (weight < -0.45) {
- return `<span class="red">---- rep</span>`;
+ return `<span class="red">−−−− rep</span>`;
} else if (weight < -0.30) {
- return `<span class="red">--- rep</span>`;
+ return `<span class="red">−−− rep</span>`;
} else if (weight < -0.15) {
- return `<span class="red">-- rep</span>`;
+ return `<span class="red">−− rep</span>`;
} else if (weight < 0) {
- return `<span class="red">- rep</span>`;
+ return `<span class="red">− rep</span>`;
}
/* return weight;*/
}
@@ -1330,37 +1330,37 @@ window.budgetLine = function(category, title) {
let income;
let expenses;
let profits;
+
if (passage() === "Rep Budget") {
- income = "$lastWeeksRepIncome";
- expenses = "$lastWeeksRepExpenses";
- profits = "$lastWeeksRepProfits";
-
- return `<<if ${income}.${category} || ${expenses}.${category} || $showAllEntries.repBudget>><tr>\
- <td>${title}</td>\
- <td><<print repFormat(${income}.${category})>></td>\
- <td><<print repFormat(${expenses}.${category})>></td>\
- <<set ${profits}.${category} = (${income}.${category} + ${expenses}.${category})>>\
- <td><<print repFormat(${profits}.${category})>></td>\
- </tr><</if>>`;
+ income = "lastWeeksRepIncome";
+ expenses = "lastWeeksRepExpenses";
+ profits = "lastWeeksRepProfits";
+
+ if (V[income][category] || V[expenses][category] || V.showAllEntries.repBudget) {
+ V[profits][category] = V[income][category] + V[expenses][category];
+ return `<tr>\
+ <td>${title}</td>\
+ <td>${repFormat(V[income][category])}</td>\
+ <td>${repFormat(V[expenses][category])}</td>\
+ <td>${repFormat(V[profits][category])}</td>\
+ </tr>`;
+ }
} else if (passage() === "Costs Budget") {
- income = "$lastWeeksCashIncome";
- expenses = "$lastWeeksCashExpenses";
- profits = "$lastWeeksCashProfits";
-
- return `<<if ${income}.${category} || ${expenses}.${category} || $showAllEntries.costsBudget>><tr>\
- <td>${title}</td>\
- <td>\
- <<print cashFormatColor(${income}.${category})>>
- </td>\
- <td>\
- <<print cashFormatColor(-Math.abs(${expenses}.${category}))>>\
- </td>\
- <<set ${profits}.${category} = (${income}.${category} + ${expenses}.${category})>>\
- <td>\
- <<print cashFormatColor(${profits}.${category})>>
- </td>\
- </tr><</if>>`;
+ income = "lastWeeksCashIncome";
+ expenses = "lastWeeksCashExpenses";
+ profits = "lastWeeksCashProfits";
+
+ if (V[income][category] || V[expenses][category] || V.showAllEntries.costsBudget) {
+ V[profits][category] = V[income][category] + V[expenses][category];
+ return `<tr>\
+ <td>${title}</td>\
+ <td>${cashFormatColor(V[income][category])}</td>\
+ <td>${cashFormatColor(-Math.abs(V[expenses][category]))}</td>\
+ <td>${cashFormatColor(V[profits][category])}</td>\
+ </tr>`;
+ }
}
+ return ``;
};
/*