diff --git a/src/clj/auto_ap/ssr/company/reports/reconciliation.clj b/src/clj/auto_ap/ssr/company/reports/reconciliation.clj index 5a1a03a5..c832b03b 100644 --- a/src/clj/auto_ap/ssr/company/reports/reconciliation.clj +++ b/src/clj/auto_ap/ssr/company/reports/reconciliation.clj @@ -23,13 +23,13 @@ [:div #_{:class "overflow-scroll min-w-full max-h-[700px]"} (com/data-grid {:headers (into - [(com/data-grid-header {:class "" #_"sticky left-0 z-60 bg-gray-100"} "Bank Account") - (com/data-grid-header {:class "" #_"sticky left-0 z-60 bg-gray-100"} "Source count") - (com/data-grid-header {:class "" #_"sticky left-0 z-60 bg-gray-100"} "Synced count") - (com/data-grid-header {:class "" #_"sticky left-0 z-60 bg-gray-100"} "Approved transactions") - (com/data-grid-header {:class "" #_"sticky left-0 z-60 bg-gray-100"} "Unapproved transactions") - (com/data-grid-header {:class "" #_"sticky left-0 z-60 bg-gray-100"} "Requires feedback transactions") - (com/data-grid-header {:class "" #_"sticky left-0 z-60 bg-gray-100"} "Missing transactions")]) + [(com/data-grid-header {} "Bank Account") + (com/data-grid-header {} "Source count") + (com/data-grid-header {} "Synced count") + (com/data-grid-header {} "Approved transactions") + (com/data-grid-header {} "Unapproved transactions") + (com/data-grid-header {} "Requires feedback transactions") + (com/data-grid-header {} "Missing transactions")]) #_#_:thead-params {:class "sticky top-0 z-50"}} (for [row report] (let [matches? (= (:external-transaction-count row) @@ -51,31 +51,28 @@ (com/data-grid-cell {:class class} (:requires-feedback-count row)) (com/data-grid-cell {:class class} - [:div { :x-data (hx/json {:popper nil - :hovering false}) - "x-init" "popper = Popper.createPopper($refs.hover_target, $refs.tooltip, {placement: 'bottom', strategy:'fixed', modifiers: [{name: 'preventOverflow'}, {name: 'offset', options: {offset: [0, 10]}}]});"} - (com/button {"x-ref" "hover_target" - "@click.prevent" "hovering=!hovering; $nextTick(() => popper.update())"} - [:div.flex.gap-2.items-center - (count (:missing-transactions row)) - [:div.w-4.h-4 svg/question] - - ]) - [:div (hx/alpine-appear {:x-ref "tooltip" - :x-show "hovering" - :class "bg-gray-100 dark:bg-gray-600 rounded-lg shadow-2xl w-max z-50 p-4"}) - (com/data-grid {:headers [(com/data-grid-header {} "Date") - (com/data-grid-header {} "Amount")]} - (for [r (:missing-transactions row)] - (com/data-grid-row {} - (com/data-grid-cell {} - (atime/unparse-local (coerce/to-date-time (:transaction/date r)) atime/normal-date)) - (com/data-grid-cell {} - (format "$%,.2f" (:transaction/amount r)))))) - ] - - - ])))))]) + (when (> (count (:missing-transactions row)) 0) + [:div { :x-data (hx/json {:popper nil + :hovering false}) + "x-init" "popper = Popper.createPopper($refs.hover_target, $refs.tooltip, {placement: 'bottom', strategy:'fixed', modifiers: [{name: 'preventOverflow'}, {name: 'offset', options: {offset: [0, 10]}}]});"} + (com/button {"x-ref" "hover_target" + "@click.prevent" "hovering=!hovering; $nextTick(() => popper.update())"} + [:div.flex.gap-2.items-center + (count (:missing-transactions row)) + [:div.w-4.h-4 svg/question] + + ]) + [:div (hx/alpine-appear {:x-ref "tooltip" + :x-show "hovering" + :class "bg-gray-100 dark:bg-gray-600 rounded-lg shadow-2xl w-max z-50 p-4"}) + (com/data-grid {:headers [(com/data-grid-header {} "Date") + (com/data-grid-header {} "Amount")]} + (for [r (:missing-transactions row)] + (com/data-grid-row {} + (com/data-grid-cell {} + (atime/unparse-local (coerce/to-date-time (:transaction/date r)) atime/normal-date)) + (com/data-grid-cell {} + (format "$%,.2f" (:transaction/amount r)))))) ] ]))))))]) (defn reconciliation-card* [{:keys [request report]}]