diff --git a/src/endWeek/reports/dairyReport.js b/src/endWeek/reports/dairyReport.js index 6d6f1c2d2c2d22007901f306fbcad4f2d2172205..4c2bc042d374815031d460f82b8bc016bdf38623 100644 --- a/src/endWeek/reports/dairyReport.js +++ b/src/endWeek/reports/dairyReport.js @@ -497,17 +497,17 @@ App.EndWeek.dairyReport = function() { App.Events.addNode(slaveEntry, r, "div"); _milkResults = App.SlaveAssignment.getMilked(slave); - const indented = document.createElement("div"); - indented.classList.add("indent"); App.Events.addNode( - indented, + slaveEntry, [ He, _milkResults.text, App.SlaveAssignment.standardSlaveReport(slave, false) - ] + ], + "div", + "indent" ); - slaveEntry.append(indented); + console.log(_milkResults.text); } else { // discard return values silently App.SlaveAssignment.choosesOwnJob(slave); diff --git a/src/events/eventUtils.js b/src/events/eventUtils.js index da56dda3a448cebf229c30f51f71f2e763546619..6a117d3f283b325621417b3d09bd237fd7d42943 100644 --- a/src/events/eventUtils.js +++ b/src/events/eventUtils.js @@ -144,12 +144,14 @@ App.Events.addParagraph = function(node, sentences) { }; /** assemble an element from an array of DOM nodes, sentences or sentence fragments (which may contain HTML) + * @template {keyof HTMLElementTagNameMap} K * @param {Node} node * @param {Array<string|HTMLElement|DocumentFragment>} sentences - * @param {string} [element] + * @param {K} [element] + * @param {string|Array<string>} [classNames] */ -App.Events.addNode = function(node, sentences, element) { - const el = (element) ? document.createElement(element) : new DocumentFragment(); +App.Events.addNode = function(node, sentences, element, classNames) { + const el = (element) ? App.UI.DOM.makeElement(element, null, classNames) : new DocumentFragment(); $(el).append(...App.Events.spaceSentences(sentences)); node.appendChild(el); };