@projectcaluma/ember-distribution 11.0.0-beta.29 → 11.0.0-beta.30

package/addon/components/cd-navigation/controls.hbs

@@ -1,67 +1,113 @@
-<div class="uk-text-center uk-margin-small-top">
-  {{#if (can "send inquiries of distribution")}}
-    <button
-      type="button"
-      class="uk-icon-button uk-button-primary"
-      {{uk-tooltip (t "caluma.distribution.send")}}
-      data-test-send-pending-inquiries
-      {{on "click" (perform this.sendInquiries)}}
-    >
-      {{#if this.sendInquiries.isRunning}}
-        <UkSpinner @ratio={{0.6}} />
-      {{else}}
-        <UkIcon @icon="comment" />
-      {{/if}}
-    </button>
+{{#if
+  (or
+    (can "send inquiries of distribution")
+    (can "create inquiry of distribution")
+    (can "complete distribution")
+    (can "reopen distribution")
+  )
+}}
+  {{#if @useButtons}}
+    {{#if (can "create inquiry of distribution")}}
+      <LinkTo
+        @route="new"
+        class="uk-button uk-button-primary"
+        data-test-new-inquiry
+      >
+        {{t "caluma.distribution.start"}}
+      </LinkTo>
+    {{/if}}
+    {{#if (can "complete distribution")}}
+      <UkButton
+        @onClick={{perform this.completeDistribution}}
+        @label={{t "caluma.distribution.skip"}}
+        @loading={{this.completeDistribution.isRunning}}
+        @disabled={{this.completeDistribution.isRunning}}
+        data-test-complete-distribution
+      />
+    {{/if}}
+    {{#if (can "reopen distribution")}}
+      <UkButton
+        @onClick={{perform this.reopenDistribution}}
+        @label={{t "caluma.distribution.reopen"}}
+        @loading={{this.reopenDistribution.isRunning}}
+        @disabled={{this.reopenDistribution.isRunning}}
+        data-test-reopen-distribution
+      />
+    {{/if}}
+  {{else}}
+    <li class="uk-margin-small">
+      <div class="uk-text-center">
+        {{#if (can "send inquiries of distribution")}}
+          <button
+            type="button"
+            class="uk-icon-button uk-button-primary"
+            {{uk-tooltip (t "caluma.distribution.send")}}
+            data-test-send-pending-inquiries
+            {{on "click" (perform this.sendInquiries)}}
+          >
+            {{#if this.sendInquiries.isRunning}}
+              <UkSpinner @ratio={{0.6}} />
+            {{else}}
+              <UkIcon @icon="comment" />
+            {{/if}}
+          </button>
+        {{/if}}
+        {{#if (can "create inquiry of distribution")}}
+          <LinkTo
+            @route="new"
+            class="uk-icon-button"
+            {{uk-tooltip (t "caluma.distribution.new.title")}}
+            data-test-new-inquiry
+          >
+            <UkIcon @icon="plus" />
+          </LinkTo>
+        {{/if}}
+        {{#if (can "check inquiries of distribution")}}
+          <button
+            type="button"
+            class="uk-icon-button"
+            {{uk-tooltip (t "caluma.distribution.check-inquiries")}}
+            data-test-check-inquiries
+            {{on "click" (perform this.checkInquiries)}}
+          >
+            {{#if this.checkInquiries.isRunning}}
+              <UkSpinner @ratio={{0.6}} />
+            {{else}}
+              <UkIcon @icon="check" />
+            {{/if}}
+          </button>
+        {{/if}}
+        {{#if (can "complete distribution")}}
+          <button
+            type="button"
+            class="uk-icon-button"
+            {{uk-tooltip (t "caluma.distribution.complete")}}
+            data-test-complete-distribution
+            {{on "click" (perform this.completeDistribution)}}
+          >
+            {{#if this.completeDistribution.isRunning}}
+              <UkSpinner @ratio={{0.6}} />
+            {{else}}
+              <UkIcon @icon="lock" />
+            {{/if}}
+          </button>
+        {{/if}}
+        {{#if (can "reopen distribution")}}
+          <button
+            type="button"
+            class="uk-icon-button"
+            {{uk-tooltip (t "caluma.distribution.reopen")}}
+            data-test-reopen-distribution
+            {{on "click" (perform this.reopenDistribution)}}
+          >
+            {{#if this.reopenDistribution.isRunning}}
+              <UkSpinner @ratio={{0.6}} />
+            {{else}}
+              <UkIcon @icon="refresh" />
+            {{/if}}
+          </button>
+        {{/if}}
+      </div>
+    </li>
   {{/if}}
-  {{#if (can "create inquiry of distribution")}}
-    <LinkTo
-      @route="new"
-      class="uk-icon-button"
-      {{uk-tooltip (t "caluma.distribution.new.title")}}
-      data-test-new-inquiry
-    >
-      <UkIcon @icon="plus" />
-    </LinkTo>
-  {{/if}}
-  {{#if (can "complete distribution")}}
-    <button
-      type="button"
-      class="uk-icon-button"
-      {{uk-tooltip
-        (t
-          (if
-            this.hasInquiries
-            "caluma.distribution.complete"
-            "caluma.distribution.skip"
-          )
-        )
-      }}
-      data-test-complete-distribution
-      {{on "click" (perform this.completeDistribution)}}
-    >
-      {{#if this.completeDistribution.isRunning}}
-        <UkSpinner @ratio={{0.6}} />
-      {{else if this.hasInquiries}}
-        <UkIcon @icon="lock" />
-      {{else}}
-        <UkIcon @icon="forward" />
-      {{/if}}
-    </button>
-  {{/if}}
-  {{#if (can "reopen distribution")}}
-    <button
-      type="button"
-      class="uk-icon-button"
-      {{uk-tooltip (t "caluma.distribution.reopen")}}
-      data-test-reopen-distribution
-      {{on "click" (perform this.reopenDistribution)}}
-    >
-      {{#if this.reopenDistribution.isRunning}}
-        <UkSpinner @ratio={{0.6}} />
-      {{else}}
-        <UkIcon @icon="refresh" />
-      {{/if}}
-    </button>
-  {{/if}}
-</div>
+{{/if}}

package/addon/components/cd-navigation/controls.js

@@ -20,20 +20,12 @@ export default class CdNavigationControlsComponent extends Component {
   @queryManager apollo;
   @config config;
 
-  get hasInquiries() {
-    return (
-      this.distribution.navigation.value?.addressed.edges.length > 0 ||
-      this.distribution.navigation.value?.controlling.edges.length > 0 ||
-      this.distribution.navigation.value?.more.edges.length > 0
-    );
-  }
-
   @dropTask
   *completeDistribution() {
     try {
       let confirmText = this.intl.t("caluma.distribution.skip-confirm");
 
-      if (this.hasInquiries) {
+      if (this.distribution.hasInquiries) {
         const incompleteInquiries = yield this.apollo.query(
           {
             query: incompleteInquiriesQuery,
@@ -104,15 +96,20 @@ export default class CdNavigationControlsComponent extends Component {
 
   @dropTask
   *sendInquiries() {
-    if (!(yield confirm(this.intl.t("caluma.distribution.send-confirm")))) {
+    const ids = this.distribution.controls.value.send.edges
+      .filter((edge) => edge.node.status === "SUSPENDED")
+      .map((edge) => decodeId(edge.node.id));
+
+    if (
+      ids.length &&
+      !(yield confirm(
+        this.intl.t("caluma.distribution.send-confirm", { count: ids.length })
+      ))
+    ) {
       return;
     }
 
     try {
-      const ids = this.distribution.controls.value.send.edges.map((edge) =>
-        decodeId(edge.node.id)
-      );
-
       const mutations = ids.map(
         (id, index) => `
         sendInquiry${index}: resumeWorkItem(input: { id: "${id}" }) {
@@ -131,4 +128,22 @@ export default class CdNavigationControlsComponent extends Component {
       this.notification.danger(this.intl.t("caluma.distribution.send-error"));
     }
   }
+
+  @dropTask
+  *checkInquiries() {
+    try {
+      yield this.apollo.mutate({
+        mutation: completeWorkItemMutation,
+        variables: {
+          workItem: decodeId(
+            this.distribution.controls.value?.check.edges[0]?.node.id
+          ),
+        },
+      });
+    } catch (e) {
+      this.notification.danger(
+        this.intl.t("caluma.distribution.check-inquiries-error")
+      );
+    }
+  }
 }

package/addon/components/cd-navigation/item.hbs

@@ -1,17 +1,28 @@
 <li class="uk-width-auto {{if this.isActive 'uk-active'}}">
   <LinkTo @route="inquiry" @model={{this.model}}>
-    {{#let
-      (if
-        (eq @type "addressed")
-        @inquiry.controllingGroupName
-        @inquiry.addressedGroupName
-      )
-      as |name|
-    }}
-      <span class="uk-width-expand uk-text-truncate" title={{name}}>
-        {{name}}
+    {{#if (eq @type "addressed")}}
+      <span
+        class="uk-width-expand uk-text-truncate"
+        title={{t
+          "caluma.distribution.attention-to"
+          subject=@inquiry.controllingGroupName
+          abbr=false
+        }}
+      >
+        {{t
+          "caluma.distribution.attention-to"
+          subject=@inquiry.controllingGroupName
+          abbr=true
+        }}
       </span>
-    {{/let}}
+    {{else}}
+      <span
+        class="uk-width-expand uk-text-truncate"
+        title={{@inquiry.addressedGroupName}}
+      >
+        {{@inquiry.addressedGroupName}}
+      </span>
+    {{/if}}
 
     <CdNavigation::StatusIndicator @inquiry={{@inquiry}} @type={{@type}} />
   </LinkTo>

package/addon/components/cd-navigation/section.hbs

@@ -1,28 +1,22 @@
-<li
-  class="uk-margin-small-bottom uk-width-auto {{if this.isActive 'uk-active'}}"
->
-  <a href="" {{on "click" this.toggle}}>
-    <span class="uk-width-expand">
-      {{t (concat "caluma.distribution.types." @type)}}
-    </span>
-    {{#if this.expanded}}
-      <UkIcon @icon="chevron-down" />
-    {{else}}
-      <UkIcon @icon="chevron-right" />
-    {{/if}}
-  </a>
+{{#if @inquiries.length}}
+  <li class="uk-margin-small uk-width-auto {{if this.isActive 'uk-active'}}">
+    <a href="" {{on "click" this.toggle}}>
+      <span class="uk-width-expand">
+        {{t (concat "caluma.distribution.types." @type)}}
+      </span>
+      {{#if this.expanded}}
+        <UkIcon @icon="chevron-down" />
+      {{else}}
+        <UkIcon @icon="chevron-right" />
+      {{/if}}
+    </a>
 
-  {{#if this.expanded}}
-    {{#if @inquiries.length}}
+    {{#if this.expanded}}
       <ul class="uk-tab uk-tab-left uk-margin-left uk-width-auto">
         {{#each this.inquiries as |inquiry|}}
           <CdNavigation::Item @inquiry={{inquiry}} @type={{@type}} />
         {{/each}}
       </ul>
     {{/if}}
-
-    {{#if (eq @type "controlling")}}
-      <CdNavigation::Controls />
-    {{/if}}
-  {{/if}}
-</li>
+  </li>
+{{/if}}

package/addon/components/cd-navigation.hbs

@@ -1,11 +1,13 @@
 <ul class="uk-tab uk-tab-left uk-margin-remove-bottom uk-width-auto">
-  <CdNavigation::Section
-    @type="controlling"
-    @inquiries={{this.inquiries.controlling}}
-  />
+  <CdNavigation::Controls />
+
   <CdNavigation::Section
     @type="addressed"
     @inquiries={{this.inquiries.addressed}}
   />
+  <CdNavigation::Section
+    @type="controlling"
+    @inquiries={{this.inquiries.controlling}}
+  />
   <CdNavigation::Section @type="more" @inquiries={{this.inquiries.more}} />
 </ul>

package/addon/config.js

@@ -20,6 +20,7 @@ export default function config(target, property) {
           controls: {
             createTask: "create-inquiry",
             completeTask: "complete-distribution",
+            checkTask: "check-inquiries",
           },
           warningPeriod: 3,
           inquiry: {
@@ -59,6 +60,7 @@ export default function config(target, property) {
             },
           },
           new: {
+            defaultDeadlineLeadTime: 30,
             defaultTypes: ["suggestions"],
             types: {
               suggestions: {

package/addon/gql/queries/control-work-items.graphql

@@ -2,6 +2,7 @@ query ControlWorkItems(
   $createTask: ID!
   $completeTask: ID!
   $inquiryTask: ID!
+  $checkTask: ID!
   $caseId: ID!
   $currentGroup: String!
 ) {
@@ -50,6 +51,22 @@ query ControlWorkItems(
       }
     }
   }
+  check: allWorkItems(
+    filter: [
+      { case: $caseId }
+      { task: $checkTask }
+      { status: READY }
+      { hasDeadline: true }
+      { addressedGroups: [$currentGroup] }
+    ]
+  ) {
+    edges {
+      node {
+        id
+        status
+      }
+    }
+  }
   case: allCases(filter: [{ id: $caseId }]) {
     edges {
       node {

package/addon/gql/queries/inquiry-form.graphql

@@ -0,0 +1,26 @@
+#import FieldQuestion, FieldTableQuestion, SimpleQuestion from '@projectcaluma/ember-form/gql/fragments/field.graphql'
+
+query InquiryForm($inquiryTask: String!) {
+  allTasks(filter: [{ slug: $inquiryTask }], first: 1) {
+    edges {
+      node {
+        id
+        ... on CompleteTaskFormTask {
+          form {
+            id
+            slug
+            name
+            meta
+            questions {
+              edges {
+                node {
+                  ...FieldQuestion
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/addon/services/distribution.js

@@ -25,6 +25,14 @@ export default class DistributionService extends Service {
     return getOwner(this).lookup("route:application").currentModel;
   }
 
+  get hasInquiries() {
+    return (
+      this.navigation.value?.addressed.edges.length > 0 ||
+      this.navigation.value?.controlling.edges.length > 0 ||
+      this.navigation.value?.more.edges.length > 0
+    );
+  }
+
   controls = trackedTask(this, this.fetchControls, () => [this.caseId]);
   navigation = trackedTask(this, this.fetchNavigation, () => [this.caseId]);
 
@@ -51,6 +59,7 @@ export default class DistributionService extends Service {
         createTask: this.config.controls.createTask,
         completeTask: this.config.controls.completeTask,
         inquiryTask: this.config.inquiry.task,
+        checkTask: this.config.controls.checkTask,
       },
     });
   }
@@ -93,7 +102,7 @@ export default class DistributionService extends Service {
   }
 
   @dropTask
-  *createInquiry(groups) {
+  *createInquiry(groups, context = {}) {
     try {
       // get create inquiry work item to complete
       const createId = decodeId(this.controls.value?.create.edges[0].node.id);
@@ -104,6 +113,7 @@ export default class DistributionService extends Service {
         variables: {
           id: createId,
           context: JSON.stringify({
+            ...context,
             addressed_groups: groups.map(String),
           }),
         },

package/addon/templates/application.hbs

@@ -8,11 +8,13 @@
   </div>
 {{else}}
   <div uk-grid class={{if this.config.ui.stack "uk-grid-small"}}>
-    <div class={{if this.config.ui.stack "uk-width-1-1" "uk-width-1-3"}}>
-      <CdNavigation @caseId={{@model}} />
-    </div>
-    {{#if this.config.ui.stack}}<div class="uk-width-1-1"><hr /></div>{{/if}}
-    <div class={{if this.config.ui.stack "uk-width-1-1" "uk-width-2-3"}}>
+    {{#if this.distribution.hasInquiries}}
+      <div class={{if this.config.ui.stack "uk-width-1-1" "uk-width-1-3"}}>
+        <CdNavigation @caseId={{@model}} />
+      </div>
+      {{#if this.config.ui.stack}}<div class="uk-width-1-1"><hr /></div>{{/if}}
+    {{/if}}
+    <div class="uk-width-expand">
       {{outlet}}
     </div>
   </div>

package/addon/templates/index.hbs

@@ -3,9 +3,5 @@
   <p class="uk-margin-medium uk-margin-remove-horizontal">
     {{t "caluma.distribution.empty"}}
   </p>
-  {{#if (can "create inquiry of distribution")}}
-    <LinkTo @route="new" class="uk-button uk-button-primary">
-      {{t "caluma.distribution.start"}}
-    </LinkTo>
-  {{/if}}
+  <CdNavigation::Controls @useButtons={{true}} />
 </div>

package/app/components/cd-inquiry-new-form/bulk-edit.js

@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-distribution/components/cd-inquiry-new-form/bulk-edit";

package/app/components/cd-inquiry-new-form/select.js

@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-distribution/components/cd-inquiry-new-form/select";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "11.0.0-beta.29",
+  "version": "11.0.0-beta.30",
   "description": "Ember engine for the Caluma distribution module.",
   "keywords": [
     "ember-addon",
@@ -20,14 +20,14 @@
   "dependencies": {
     "@ember/legacy-built-in-components": "^0.4.1",
     "@ember/string": "^3.0.0",
-    "@embroider/macros": "^1.8.3",
+    "@embroider/macros": "^1.9.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@projectcaluma/ember-core": "^11.0.0-beta.29",
-    "@projectcaluma/ember-form": "^11.0.0-beta.29",
-    "@projectcaluma/ember-workflow": "^11.0.0-beta.29",
+    "@projectcaluma/ember-core": "^11.0.0-beta.30",
+    "@projectcaluma/ember-form": "^11.0.0-beta.30",
+    "@projectcaluma/ember-workflow": "^11.0.0-beta.30",
     "ember-apollo-client": "~4.0.2",
-    "ember-auto-import": "^2.4.2",
+    "ember-auto-import": "^2.4.3",
     "ember-can": "^4.2.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.1.1",
@@ -37,21 +37,21 @@
     "ember-intl": "^5.7.2",
     "ember-pikaday": "^4.0.0",
     "ember-resources": "^5.4.0",
-    "ember-svg-jar": "^2.3.4",
+    "ember-svg-jar": "^2.4.0",
     "ember-test-selectors": "^6.0.0",
     "ember-uikit": "^6.1.0",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "lodash.merge": "^4.6.2",
-    "luxon": "^3.0.3",
+    "luxon": "^3.0.4",
     "tracked-toolbox": "^1.2.3"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@ember/test-helpers": "2.7.0",
     "@embroider/test-setup": "1.8.3",
-    "@faker-js/faker": "7.5.0",
-    "@projectcaluma/ember-testing": "11.0.0-beta.29",
+    "@faker-js/faker": "7.6.0",
+    "@projectcaluma/ember-testing": "11.0.0-beta.30",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "4.7.0",
     "ember-cli-code-coverage": "1.0.3",
@@ -64,15 +64,15 @@
     "ember-disable-prototype-extensions": "1.1.3",
     "ember-engines": "0.8.23",
     "ember-load-initializers": "2.1.2",
-    "ember-qunit": "5.1.5",
+    "ember-qunit": "6.0.0",
     "ember-resolver": "8.0.3",
-    "ember-source": "4.7.0",
+    "ember-source": "4.8.0",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
     "miragejs": "0.1.45",
     "npm-run-all": "4.1.5",
-    "qunit": "2.19.1",
+    "qunit": "2.19.2",
     "qunit-dom": "2.0.0",
     "sass": "1.55.0",
     "webpack": "5.74.0"

package/translations/de.yaml

@@ -1,16 +1,20 @@
 caluma:
   distribution:
     empty: "Es wurden noch keine Anfragen erstellt."
-    start: "Starten"
+    start: "Zirkulation starten"
     send: "Offene Anfragen versenden"
     complete: "Zirkulation abschliessen"
     skip: "Zirkulation überspringen"
     reopen: "Zirkulation wiedereröffnen"
-    send-confirm: "Wollen Sie wirklich alle offenen Anfragen versenden?"
+    check-inquiries: "Stellungnahmen als geprüft markieren"
+    send-confirm:
+      "Wollen Sie wirklich <b>{count, plural, =1 {eine offene Anfrage} other
+      {{count} offene Anfragen}}</b> versenden?"
     complete-confirm:
-      "Es gibt noch <b>{count} offene {count, plural, =1 {Anfrage} other {Anfragen}}</b>
-      in der aktuellen Zirkulation. Wenn Sie die Zirkulation abschliessen, werden
-      alle verbleibenden offenen Anfragen abgebrochen. Möchten Sie fortfahren?"
+      "Es gibt noch <b>{count, plural, =1 {eine offene Anfrage} other {{count}
+      offene Anfragen}}</b> in der aktuellen Zirkulation. Wenn Sie die
+      Zirkulation abschliessen, werden alle verbleibenden offenen Anfragen
+      abgebrochen. Möchten Sie fortfahren?"
     complete-confirm-empty: "Möchten Sie die Zirkulation wirklich abschliessen?"
     skip-confirm: "Wollen Sie die Zirkulation wirklich überspringen?"
     reopen-confirm: "Wollen Sie die Zirkulation wirklich wiedereröffnen?"
@@ -18,6 +22,9 @@ caluma:
     complete-error: "Fehler beim Abschliessen der Zirkulation"
     skip-error: "Fehler beim Überspringen der Zirkulation"
     reopen-error: "Fehler beim Wiedereröffnen der Zirkulation"
+    check-inquiries-error: "Fehler beim Markieren der Stellungnahmen als geprüft"
+
+    attention-to: "{abbr, select, true {z. H.} other {zu Handen}} {subject}"
 
     more: "mehr"
     less: "weniger"
@@ -33,6 +40,10 @@ caluma:
       send: "Aktuelle Anfrage versenden"
       send-error: "Fehler beim Senden der Anfrage"
       send-not-allowed: "Sie sind nicht berechtigt diese Anfrage zu versenden."
+      edit-sent:
+        "<b>Achtung:</b> Sie bearbeiten eine Anfrage, die bereits versendet
+        wurde. Falls Sie die Details grundlegend ändern, kann es sein, dass die
+        adressierte Stelle dies nicht bemerkt, da sie nicht informiert wird."
 
     answer:
       link: "Beantworten"
@@ -62,6 +73,8 @@ caluma:
       selected: "{count, plural, other {ausgewählt}}"
       reset: "Zurücksetzen"
       create-draft: "Entwurf erstellen"
+      continue: "Weiter"
+      back: "Zurück"
       error: "Fehler beim Erstellen der {count, plural, =1 {Anfragen} other {Anfrage}}"
 
     reminder:
@@ -73,9 +86,9 @@ caluma:
       error: "Fehler beim Versenden der Erinnerung"
 
     types:
-      controlling: "Angefordert"
-      addressed: "Zu beantworten"
-      more: "Weitere"
+      controlling: "Angeforderte Stellungnahmen"
+      addressed: "Eigene Stellungnahmen"
+      more: "Weitere Stellungnahmen"
 
     status:
       draft: "Entwurf"