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

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

@@ -1,4 +1,33 @@
-#import InquiryAnswerButtons, InquiryDialog, InquiryDeadlineDocument, InquiryStatusDocument, InquiryRequest from '../fragments/inquiry.graphql'
+# import InquiryAnswer, InquiryAnswerButtons, InquiryAnswerStatus from '../fragments/inquiry-answer.graphql'
+# import InquiryRequest, InquiryRequestDeadline from '../fragments/inquiry-request.graphql'
+
+fragment DialogInquiry on WorkItem {
+  id
+  addressedGroups
+  controllingGroups
+  assignedUsers
+  createdAt
+  closedAt
+  status
+  isRedoable
+  task {
+    id
+    slug
+  }
+  meta
+  document {
+    id
+    ...InquiryRequest
+  }
+  childCase {
+    id
+    ...InquiryAnswerButtons
+    document {
+      id
+      ...InquiryAnswer
+    }
+  }
+}
 
 query InquiryDialog(
   $task: ID!
@@ -22,7 +51,7 @@ query InquiryDialog(
   ) {
     edges {
       node {
-        ...InquiryDialog
+        ...DialogInquiry
       }
     }
   }

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/gql/queries/{inquiry-navigation.graphql → navigation.graphql}

@@ -1,12 +1,30 @@
-#import Inquiry, InquiryDeadlineDocument, InquiryStatusDocument from '../fragments/inquiry.graphql'
+# import InquiryAnswerStatus from '../fragments/inquiry-answer.graphql'
+# import InquiryRequestDeadline from '../fragments/inquiry-request.graphql'
 
-query InquiryNavigation(
+fragment NavigationInquiry on WorkItem {
+  id
+  status
+  addressedGroups
+  controllingGroups
+  document {
+    id
+    ...InquiryRequestDeadline
+  }
+  childCase {
+    id
+    document {
+      id
+      ...InquiryAnswerStatus
+    }
+  }
+}
+
+query Navigation(
   $task: ID!
   $statusQuestion: ID
   $deadlineQuestion: ID
   $currentGroup: String!
   $caseId: ID!
-  $includeNavigationData: Boolean!
 ) {
   controlling: allWorkItems(
     filter: [
@@ -19,7 +37,7 @@ query InquiryNavigation(
   ) {
     edges {
       node {
-        ...Inquiry
+        ...NavigationInquiry
       }
     }
   }
@@ -35,7 +53,7 @@ query InquiryNavigation(
   ) {
     edges {
       node {
-        ...Inquiry
+        ...NavigationInquiry
       }
     }
   }
@@ -52,7 +70,7 @@ query InquiryNavigation(
   ) {
     edges {
       node {
-        ...Inquiry
+        ...NavigationInquiry
       }
     }
   }

package/addon/routes/application.js

@@ -1,7 +1,14 @@
 import Route from "@ember/routing/route";
+import { inject as service } from "@ember/service";
 
 export default class ApplicationRoute extends Route {
+  @service distribution;
+
   model(params) {
     return params.case;
   }
+
+  afterModel(model) {
+    this.distribution.caseId = model;
+  }
 }

package/addon/routes/index.js

@@ -1,41 +1,28 @@
 import Route from "@ember/routing/route";
 import { inject as service } from "@ember/service";
-import { queryManager } from "ember-apollo-client";
-
-import config from "@projectcaluma/ember-distribution/config";
-import inquiryNavigationQuery from "@projectcaluma/ember-distribution/gql/queries/inquiry-navigation.graphql";
-import uniqueByGroups from "@projectcaluma/ember-distribution/utils/unique-by-groups";
 
 export default class IndexRoute extends Route {
+  @service("-scheduler") scheduler;
+  @service distribution;
   @service router;
-  @service calumaOptions;
 
-  @config config;
+  async redirect() {
+    // trigger resource
+    this.distribution.navigation.value;
 
-  @queryManager apollo;
+    // wait for navigation request and group resolver
+    await this.distribution.fetchNavigation.last;
+    await this.scheduler.resolveGroup.last;
 
-  async redirect(model) {
-    const response = await this.apollo.query({
-      query: inquiryNavigationQuery,
-      variables: {
-        caseId: model,
-        task: this.config.inquiry.task,
-        currentGroup: String(this.calumaOptions.currentGroupId),
-        includeNavigationData: false,
-      },
-    });
+    const inquiries = this.distribution.inquiries;
 
-    const models = Object.entries(response).flatMap(([, objects]) => {
-      return uniqueByGroups(objects.edges.map((edge) => edge.node)).map(
-        (inquiry) => ({
-          from: inquiry.controllingGroups[0],
-          to: inquiry.addressedGroups[0],
-        })
-      );
-    }, {});
+    const firstInquiry = inquiries.addressed[0] ?? inquiries.controlling[0];
 
-    if (models.length) {
-      return this.router.replaceWith("inquiry", models[0]);
+    if (firstInquiry) {
+      return this.router.replaceWith("inquiry", {
+        from: firstInquiry.controllingGroups[0],
+        to: firstInquiry.addressedGroups[0],
+      });
     }
   }
 }

package/addon/routes/inquiry/index.js

@@ -2,9 +2,6 @@ import Route from "@ember/routing/route";
 
 export default class InquiryIndexRoute extends Route {
   model() {
-    return {
-      ...this.modelFor("inquiry"),
-      case: this.modelFor("application"),
-    };
+    return this.modelFor("inquiry");
   }
 }

package/addon/routes/new.js

@@ -1,7 +1,3 @@
 import Route from "@ember/routing/route";
 
-export default class NewRoute extends Route {
-  model() {
-    return this.modelFor("application");
-  }
-}
+export default class NewRoute extends Route {}

package/addon/services/distribution.js

@@ -1,14 +1,17 @@
-import { getOwner } from "@ember/application";
 import Service, { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
 import { queryManager, getObservable } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
 import { trackedTask } from "ember-resources/util/ember-concurrency";
+import { cached } from "tracked-toolbox";
 
 import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
 import config from "@projectcaluma/ember-distribution/config";
 import createInquiryMutation from "@projectcaluma/ember-distribution/gql/mutations/create-inquiry.graphql";
-import controlWorkItemsQuery from "@projectcaluma/ember-distribution/gql/queries/control-work-items.graphql";
-import inquiryNavigationQuery from "@projectcaluma/ember-distribution/gql/queries/inquiry-navigation.graphql";
+import controlsQuery from "@projectcaluma/ember-distribution/gql/queries/controls.graphql";
+import inquiryDialogQuery from "@projectcaluma/ember-distribution/gql/queries/inquiry-dialog.graphql";
+import navigationQuery from "@projectcaluma/ember-distribution/gql/queries/navigation.graphql";
+import uniqueByGroups from "@projectcaluma/ember-distribution/utils/unique-by-groups";
 
 export default class DistributionService extends Service {
   @service("-scheduler") scheduler;
@@ -21,8 +24,14 @@ export default class DistributionService extends Service {
 
   @config config;
 
-  get caseId() {
-    return getOwner(this).lookup("route:application").currentModel;
+  @tracked caseId;
+
+  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]);
@@ -44,13 +53,14 @@ export default class DistributionService extends Service {
   @dropTask
   *fetchControls(caseId) {
     return yield this.apollo.watchQuery({
-      query: controlWorkItemsQuery,
+      query: controlsQuery,
       variables: {
         caseId,
         currentGroup: String(this.calumaOptions.currentGroupId),
         createTask: this.config.controls.createTask,
         completeTask: this.config.controls.completeTask,
         inquiryTask: this.config.inquiry.task,
+        checkTask: this.config.controls.checkTask,
       },
     });
   }
@@ -58,14 +68,13 @@ export default class DistributionService extends Service {
   @dropTask
   *fetchNavigation(caseId) {
     const response = yield this.apollo.watchQuery({
-      query: inquiryNavigationQuery,
+      query: navigationQuery,
       variables: {
         caseId,
         task: this.config.inquiry.task,
         currentGroup: String(this.calumaOptions.currentGroupId),
         statusQuestion: this.config.inquiry.answer.statusQuestion,
         deadlineQuestion: this.config.inquiry.deadlineQuestion,
-        includeNavigationData: true,
       },
     });
 
@@ -93,20 +102,38 @@ 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);
 
+      // refetch dialog queries of the groups that will have a new inquiry
+      const refetchQueries = groups.map((group) => ({
+        query: inquiryDialogQuery,
+        variables: {
+          from: String(this.calumaOptions.currentGroupId),
+          to: String(group),
+          caseId: this.caseId,
+          task: this.config.inquiry.task,
+          infoQuestion: this.config.inquiry.infoQuestion,
+          deadlineQuestion: this.config.inquiry.deadlineQuestion,
+          statusQuestion: this.config.inquiry.answer.statusQuestion,
+          answerInfoQuestions: this.config.inquiry.answer.infoQuestions,
+          buttonTasks: Object.keys(this.config.inquiry.answer.buttons),
+        },
+      }));
+
       // create new inquiries
       yield this.apollo.mutate({
         mutation: createInquiryMutation,
         variables: {
           id: createId,
           context: JSON.stringify({
+            ...context,
             addressed_groups: groups.map(String),
           }),
         },
+        refetchQueries,
       });
 
       // refetch navigation and controls data
@@ -117,4 +144,49 @@ export default class DistributionService extends Service {
       );
     }
   }
+
+  @cached
+  get inquiries() {
+    const findGroupName = (identifiers) => {
+      const group = this.scheduler.groupCache.find((group) =>
+        identifiers
+          .map(String)
+          .includes(String(group[this.calumaOptions.groupIdentifierProperty]))
+      );
+
+      return group?.[this.calumaOptions.groupNameProperty] ?? "";
+    };
+
+    return Object.entries(this.navigation.value ?? {}).reduce(
+      (inquiries, [key, objects]) => {
+        return {
+          ...inquiries,
+          // Don't return any data until the internal scheduler has cached
+          // groups since we don't want to render empty navigation items
+          [key]: this.scheduler.groupCache.length
+            ? uniqueByGroups(
+                objects.edges.map((edge) => ({
+                  ...edge.node,
+                  // Populate the work item with the names of the involved
+                  // groups so the <DistributionNavigation::Section /> component
+                  // can sort by them
+                  addressedGroupName: findGroupName(edge.node.addressedGroups),
+                  controllingGroupName: findGroupName(
+                    edge.node.controllingGroups
+                  ),
+                }))
+              ).sort((a, b) => {
+                const sortProperty =
+                  key === "addressed"
+                    ? "controllingGroupName"
+                    : "addressedGroupName";
+
+                return a[sortProperty].localeCompare(b[sortProperty]);
+              })
+            : [],
+        };
+      },
+      {}
+    );
+  }
 }

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 />
+      </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/addon/templates/inquiry/index.hbs

@@ -1,5 +1 @@
-<CdInquiryDialog
-  @from={{@model.from}}
-  @to={{@model.to}}
-  @caseId={{@model.case}}
-/>
+<CdInquiryDialog @from={{@model.from}} @to={{@model.to}} />

package/addon/templates/new.hbs

@@ -1,7 +1,6 @@
 <CdInquiryNewForm
   @selectedTypes={{this.selectedTypes}}
   @search={{this.search}}
-  @caseId={{@model}}
   @onChangeSelectedTypes={{fn (mut this.selectedTypes)}}
   @onChangeSearch={{fn (mut this.search)}}
 />

package/addon/utils/inquiry-deadline.js

@@ -19,7 +19,9 @@ function decorator(
     get() {
       const inquiry = get(this, inquiryProperty);
       const value = inquiry.document?.deadline.edges[0]?.node.value;
-      const isDone = ["COMPLETED", "SKIPPED"].includes(inquiry.status);
+      const isDone = ["COMPLETED", "SKIPPED", "CANCELED"].includes(
+        inquiry.status
+      );
 
       const diff = DateTime.fromISO(value).diffNow("days").days;
 

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/app/styles/_answer-form.scss

@@ -2,3 +2,7 @@
   border-left: 5px solid $global-border;
   padding-left: $global-gutter - 5px;
 }
+
+.inquiry-answer-form__side-bar {
+  max-width: 25%;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "11.0.0-beta.29",
+  "version": "11.0.0-beta.31",
   "description": "Ember engine for the Caluma distribution module.",
   "keywords": [
     "ember-addon",
@@ -10,7 +10,7 @@
   "homepage": "https://docs.caluma.io/ember-caluma",
   "repository": "github:projectcaluma/ember-caluma",
   "scripts": {
-    "test": "npm-run-all test:*",
+    "test": "npm-run-all --print-name \"lint\" \"test:*\"",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each"
   },
@@ -20,40 +20,40 @@
   "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.31",
+    "@projectcaluma/ember-form": "^11.0.0-beta.31",
+    "@projectcaluma/ember-workflow": "^11.0.0-beta.31",
     "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",
     "ember-concurrency": "^2.3.7",
     "ember-engines-router-service": "^0.3.0",
     "ember-fetch": "^8.1.2",
+    "ember-flatpickr": "^3.2.3",
     "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.1",
     "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.31",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "4.7.0",
+    "ember-cli": "4.8.0",
     "ember-cli-code-coverage": "1.0.3",
     "ember-cli-dependency-checker": "3.3.1",
     "ember-cli-inject-live-reload": "2.1.0",
@@ -64,21 +64,21 @@
     "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"
   },
   "engines": {
-    "node": "14.* || >= 16"
+    "node": "14.* || 16.* || >= 18"
   },
   "ember": {
     "edition": "octane"

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,21 +22,33 @@ 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"
 
-    last-modified: "Zuletzt bearbeitet von {user} am {date} um {time}"
     details: "Details"
     not-allowed-hint:
       "Sie können jedoch das Formular bearbeiten und die Eingabedaten werden
       automatisch gespeichert."
 
+    inquiry:
+      created-at: "Erstellt am"
+      closed-at: "Beantwortet am"
+      deadline: "Frist"
+      assigned-user: "Verantwortliche Person"
+
     edit:
       link: "Bearbeiten"
       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"
@@ -53,6 +69,10 @@ caluma:
         revise:
           label: "Überarbeiten"
 
+      details:
+        show: "Details anzeigen"
+        hide: "Details verstecken"
+
     new:
       title: "Neue Anfrage"
       search: "Suchen..."
@@ -62,6 +82,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 +95,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"