Merge pull request #893 from Yelinz/add-circ-column

feat(ember): add amount circulation column
adfinis · Jun 23, 2023 · 1c318cd · 1c318cd
2 parents a3af5eb + 579ea6f
commit 1c318cd
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 7 deletions.
diff --git a/ember/app/caluma-query/models/work-item.js b/ember/app/caluma-query/models/work-item.js
@@ -133,12 +133,13 @@ export default class CustomWorkItemModel extends WorkItemModel {
       form {
         slug
       }
-      answers(filter: [{questions: ["circulation-decision", "circulation-comment"]}]) {
+      answers(filter: [{questions: ["circulation-decision", "circulation-comment", "circulation-antrag-betrag"]}]) {
         edges {
           node {
             id
             question {
               slug
+              meta
               ... on ChoiceQuestion {
                 options {
                   edges {
@@ -153,6 +154,9 @@ export default class CustomWorkItemModel extends WorkItemModel {
             ... on StringAnswer {
               StringAnswerValue: value
             }
+            ... on FloatAnswer {
+              FloatAnswerValue: value
+            }
           }
         }
       }

diff --git a/ember/app/ui/cases/detail/circulation/controller.js b/ember/app/ui/cases/detail/circulation/controller.js
@@ -58,6 +58,12 @@ export default class CasesDetailCirculationController extends Controller {
           answerKey: "document.answers.edges",
           type: "answer-value",
         },
+        {
+          heading: { label: "work-items.circulationAmount" },
+          questionSlug: "circulation-antrag-betrag",
+          answerKey: "document.answers.edges",
+          type: "answer-value",
+        },
         {
           heading: { label: "work-items.action" },
           type: "work-item-actions",

diff --git a/ember/app/ui/cases/detail/index/controller.js b/ember/app/ui/cases/detail/index/controller.js
@@ -15,6 +15,7 @@ import redoWorkItemMutation from "mysagw/gql/mutations/redo-work-item.graphql";
 import reopenCaseMutation from "mysagw/gql/mutations/reopen-case.graphql";
 import getCaseQuery from "mysagw/gql/queries/get-case.graphql";
 import downloadFile from "mysagw/utils/download-file";
+import formatCurrency from "mysagw/utils/format-currency";
 import CaseValidations from "mysagw/validations/case";
 
 export default class CasesDetailIndexController extends Controller {
@@ -128,12 +129,7 @@ export default class CasesDetailIndexController extends Controller {
     let value = answer.node[`${answer.node.__typename}Value`];
 
     if (answer.node.question.meta.waehrung) {
-      value = new Intl.NumberFormat("de-CH", {
-        style: "currency",
-        currency: answer.node.question.meta.waehrung,
-      })
-        .format(value)
-        .replace(".00", ".-");
+      value = formatCurrency(value, answer.node.question.meta.waehrung);
     }
 
     return {

diff --git a/ember/app/ui/components/dynamic-table/answer-value/component.js b/ember/app/ui/components/dynamic-table/answer-value/component.js
@@ -1,6 +1,8 @@
 import { get } from "@ember/object";
 import Component from "@glimmer/component";
 
+import formatCurrency from "mysagw/utils/format-currency";
+
 export default class AnswerValue extends Component {
   get value() {
     const value = this.args.value.parentWorkItem ?? this.args.value;
@@ -20,6 +22,13 @@ export default class AnswerValue extends Component {
       ).node.label;
     }
 
+    if (answer.question.meta?.waehrung) {
+      return formatCurrency(
+        answer[`${answer.__typename}Value`],
+        answer.question.meta.waehrung
+      );
+    }
+
     return answer[`${answer.__typename}Value`];
   }
 }
diff --git a/ember/app/utils/format-currency.js b/ember/app/utils/format-currency.js
@@ -0,0 +1,8 @@
+export default function formatCurrency(value, currency) {
+  return new Intl.NumberFormat("de-CH", {
+    style: "currency",
+    currency,
+  })
+    .format(value)
+    .replace(".00", ".-");
+}
diff --git a/ember/translations/work-items/de.yaml b/ember/translations/work-items/de.yaml
@@ -15,6 +15,7 @@ work-items:
   documentNumber: "Referenz"
   circulationComment: "Bemerkung"
   circulationDecision: "Entscheid"
+  circulationAmount: "Betrag (WiMa)"
   distributionPlan: "Verteilplan"
 
   saveSuccess: "Aufgabe gespeichert"

diff --git a/ember/translations/work-items/en.yaml b/ember/translations/work-items/en.yaml
@@ -15,6 +15,7 @@ work-items:
   documentNumber: "Number"
   circulationComment: "Comment"
   circulationDecision: "Decision"
+  circulationAmount: "Amount (WiMa)"
   distributionPlan: "Distribution plan"
 
   saveSuccess: "Task successfully saved"

diff --git a/ember/translations/work-items/fr.yaml b/ember/translations/work-items/fr.yaml
@@ -15,6 +15,7 @@ work-items:
   documentNumber: "Référence"
   circulationComment: "Remarque"
   circulationDecision: "Décision"
+  circulationAmount: "Somme (WiMa)"
   distributionPlan: "Plan de distribution"
 
   saveSuccess: "Tâche enregistrée"