Merge branch 'develop' into release/v117

teamforus · Jun 12, 2024 · 5ad7da9 · 5ad7da9
2 parents a469645 + aa00d9c
commit 5ad7da9
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/src/sources/forus-platform/js/angular-1/i18n/i18n-nl.js b/src/sources/forus-platform/js/angular-1/i18n/i18n-nl.js
@@ -553,6 +553,7 @@ module.exports = {
             base_card: {
                 header: {
                     description: "Beschrijving",
+                    formulas: "Rekenregels",
                     statistics: "Statistieken",
                     criteria: "Voorwaarden",
                 },

diff --git a/src/sources/forus-platform/pug/tpl/pages/funds-show.pug b/src/sources/forus-platform/pug/tpl/pages/funds-show.pug
@@ -59,6 +59,10 @@
                         ng-class="{active: $ctrl.viewGeneralType == 'description'}"
                         ng-click="$ctrl.viewGeneralType = 'description'") Beschrijving
 
+                    .label-tab.label-tab-sm(
+                        ng-class="{active: $ctrl.viewGeneralType == 'formulas'}"
+                        ng-click="$ctrl.viewGeneralType = 'formulas'") Rekenregels
+
                     .label-tab.label-tab-sm(
                         ng-class="{active: $ctrl.viewGeneralType == 'statistics'}"
                         ng-click="$ctrl.viewGeneralType = 'statistics'") Statistieken
@@ -76,6 +80,36 @@
                     .arrow-box.border.bg-dim: .arrow
                     | Geen data
 
+            .card-section(ng-if="$ctrl.viewGeneralType == 'formulas'"): .card-block.card-block-table
+                .table-wrapper: table.table(ng-if="$ctrl.fund.formulas.length > 0")
+                    thead: tr
+                        th ID
+                        th Type
+                        th Bedrag
+                        th Gegeven
+                        th Aangemaakt op
+                        th.text-right Laatste aanpassing
+
+                    tbody
+                        tr(ng-repeat="formula in $ctrl.fund.formulas")
+                            td(ng-bind="formula.id")
+                            td(ng-bind="formula.type")
+                            td(ng-bind="formula.amount_locale")
+                            td(ng-bind="formula.record_type_name || '-'")
+                            td 
+                                strong(ng-bind="formula.created_at_locale.split(' - ')[0] || '-'").text-primary
+                                br
+                                span(ng-bind="formula.created_at_locale.split(' - ')[1]")
+                            td.text-right
+                                strong(ng-bind="formula.updated_at_locale.split(' - ')[0] || '-'").text-primary
+                                br
+                                span(ng-bind="formula.updated_at_locale.split(' - ')[1]")
+
+                //- Fund formulas empty
+                block-empty(
+                    ng-if="!$ctrl.fund.formulas.length"
+                    title="No fund formulas")
+
             .card-section(ng-if="$ctrl.viewGeneralType == 'criteria'").card-section-primary: .form 
                 fund-criteria-editor(
                     fund="$ctrl.fund"