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

package/addon/abilities/inquiry.js

@@ -21,11 +21,27 @@ export default class InquiryAbility extends Ability {
   }
 
   get canSend() {
-    return this.config.permissions.sendInquiry?.(this.model) ?? true;
+    return (
+      !this.config.ui.readonly &&
+      this.model?.task.slug === this.config.inquiry.task &&
+      this.model?.status === "SUSPENDED" &&
+      (this.config.permissions.sendInquiry?.(this.model) ?? true) &&
+      this.model?.controllingGroups
+        .map(String)
+        .includes(String(this.calumaOptions.currentGroupId))
+    );
   }
 
   get canWithdraw() {
-    return this.config.permissions.withdrawInquiry?.(this.model) ?? true;
+    return (
+      !this.config.ui.readonly &&
+      this.model?.task.slug === this.config.inquiry.task &&
+      this.model?.status === "SUSPENDED" &&
+      (this.config.permissions.withdrawInquiry?.(this.model) ?? true) &&
+      this.model?.controllingGroups
+        .map(String)
+        .includes(String(this.calumaOptions.currentGroupId))
+    );
   }
 
   get canAnswer() {

package/addon/components/cd-document-header.hbs

@@ -1,4 +1,4 @@
-<p class="uk-text-large uk-margin-remove uk-flex uk-flex-middle">
+<div class="uk-text-large uk-flex uk-flex-middle" data-test-document-header>
   <div class="uk-width-expand">
     {{@name}}
     {{#if @group}}
@@ -9,15 +9,6 @@
     {{/if}}
   </div>
   {{yield}}
-</p>
+</div>
 
-{{#if (and @modifiedBy @modifiedAt)}}
-  <p class="uk-text-meta uk-margin-remove-bottom uk-margin-small-top">
-    {{t
-      "caluma.distribution.last-modified"
-      user=(user-name @modifiedBy)
-      date=(format-date @modifiedAt)
-      time=(format-time @modifiedAt hour="2-digit" minute="2-digit")
-    }}
-  </p>
-{{/if}}
+<hr />

package/addon/components/cd-inquiry-answer-form.hbs

@@ -5,92 +5,152 @@
 >
   <:default as |content|>
 
-    <CdDocumentHeader
-      @name={{content.document.rootForm.raw.name}}
-      @status={{if (eq this.inquiry.status "READY") this.answerStatus}}
-      @modifiedAt={{this.inquiry.childCase.document.modifiedContentAt}}
-      @modifiedBy={{this.inquiry.childCase.document.modifiedContentByUser}}
-    >
-      <CdInquiryDialog::InquiryDeadline @inquiry={{this.inquiry}} />
-    </CdDocumentHeader>
+    <div uk-grid class="uk-grid uk-grid-small uk-grid-divider">
+      <div class="uk-width-expand">
+        <CdDocumentHeader
+          @name={{content.document.rootForm.raw.name}}
+          @status={{if (eq this.inquiry.status "READY") this.answerStatus}}
+        >
+          <CdInquiryDialog::InquiryDeadline @inquiry={{this.inquiry}} />
 
-    <hr />
+          {{#if this.inquiryDetails.length}}
+            <button
+              class="uk-icon-button uk-margin-left"
+              type="button"
+              {{uk-tooltip
+                (if
+                  this.isExpanded
+                  (t "caluma.distribution.answer.details.hide")
+                  (t "caluma.distribution.answer.details.show")
+                )
+              }}
+              {{on "click" this.toggle}}
+            >
+              <UkIcon
+                @icon={{if
+                  this.isExpanded
+                  "chevron-double-right"
+                  "chevron-double-left"
+                }}
+              />
+            </button>
+          {{/if}}
+        </CdDocumentHeader>
 
-    <div class="uk-margin uk-text-italic inquiry-answer-form__request">
-      <CdInquiryDialog::InquiryPart
-        @inquiry={{this.inquiry}}
-        @type="request"
-        @disabled={{true}}
-      />
-    </div>
+        <div class="uk-margin uk-text-italic inquiry-answer-form__request">
+          <CdInquiryDialog::InquiryPart
+            @inquiry={{this.inquiry}}
+            @type="request"
+            @disabled={{true}}
+          />
+        </div>
 
-    {{#if
-      (and
-        (not this.buttons.length)
-        (can "edit answer form of inquiry" this.inquiry)
-      )
-    }}
-      <div class="uk-alert uk-alert-warning uk-flex uk-flex-middle">
-        <UkIcon @icon="warning" class="uk-margin-small-right uk-flex-none" />
-        {{t "caluma.distribution.answer.complete-not-allowed"}}
-        {{t "caluma.distribution.not-allowed-hint"}}
-      </div>
-    {{/if}}
+        {{#if
+          (and
+            (not this.buttons.length)
+            (can "edit answer form of inquiry" this.inquiry)
+          )
+        }}
+          <div class="uk-alert uk-alert-warning uk-flex uk-flex-middle">
+            <UkIcon
+              @icon="warning"
+              class="uk-margin-small-right uk-flex-none"
+            />
+            {{t "caluma.distribution.answer.complete-not-allowed"}}
+            {{t "caluma.distribution.not-allowed-hint"}}
+          </div>
+        {{/if}}
 
-    <content.form />
+        <content.form />
 
-    {{#each this.buttons as |buttonConfig|}}
-      {{#if buttonConfig.isFormButton}}
-        <DocumentValidity @document={{content.document}} as |isValid validate|>
-          <UkButton
-            @type="submit"
-            @color={{buttonConfig.color}}
-            @disabled={{or
-              (not isValid)
-              (and
+        {{#each this.buttons as |buttonConfig|}}
+          {{#if buttonConfig.isFormButton}}
+            <DocumentValidity
+              @document={{content.document}}
+              as |isValid validate|
+            >
+              <UkButton
+                @type="submit"
+                @color={{buttonConfig.color}}
+                @disabled={{or
+                  (not isValid)
+                  (and
+                    this.completeWorkItem.isRunning
+                    (includes
+                      buttonConfig.workItemId
+                      this.completeWorkItem.lastRunning.args
+                    )
+                  )
+                }}
+                @loading={{and
+                  this.completeWorkItem.isRunning
+                  (includes
+                    buttonConfig.workItemId
+                    this.completeWorkItem.lastRunning.args
+                  )
+                }}
+                @onClick={{fn
+                  (perform this.completeWorkItem)
+                  buttonConfig.workItemId
+                  validate
+                }}
+              >{{buttonConfig.label}}</UkButton>
+            </DocumentValidity>
+          {{else}}
+            <UkButton
+              @type="button"
+              @color={{buttonConfig.color}}
+              @disabled={{and
                 this.completeWorkItem.isRunning
                 (includes
                   buttonConfig.workItemId this.completeWorkItem.lastRunning.args
                 )
-              )
-            }}
-            @loading={{and
-              this.completeWorkItem.isRunning
-              (includes
-                buttonConfig.workItemId this.completeWorkItem.lastRunning.args
-              )
-            }}
-            @onClick={{fn
-              (perform this.completeWorkItem)
-              buttonConfig.workItemId
-              validate
-            }}
-          >{{buttonConfig.label}}</UkButton>
-        </DocumentValidity>
-      {{else}}
-        <UkButton
-          @type="button"
-          @color={{buttonConfig.color}}
-          @disabled={{and
-            this.completeWorkItem.isRunning
-            (includes
-              buttonConfig.workItemId this.completeWorkItem.lastRunning.args
-            )
-          }}
-          @loading={{and
-            this.completeWorkItem.isRunning
-            (includes
-              buttonConfig.workItemId this.completeWorkItem.lastRunning.args
-            )
-          }}
-          @onClick={{fn
-            (perform this.completeWorkItem)
-            buttonConfig.workItemId
-            null
-          }}
-        >{{buttonConfig.label}}</UkButton>
+              }}
+              @loading={{and
+                this.completeWorkItem.isRunning
+                (includes
+                  buttonConfig.workItemId this.completeWorkItem.lastRunning.args
+                )
+              }}
+              @onClick={{fn
+                (perform this.completeWorkItem)
+                buttonConfig.workItemId
+                null
+              }}
+            >{{buttonConfig.label}}</UkButton>
+          {{/if}}
+        {{/each}}
+      </div>
+
+      {{#if (and this.isExpanded this.inquiryDetails.length)}}
+        <div class="inquiry-answer-form__side-bar">
+          <dl
+            class="uk-description-list uk-text-break
+              {{unless
+                this.config.ui.small
+                'uk-margin-small-left uk-margin-small-right'
+              }}"
+          >
+            {{#each this.inquiryDetails as |data|}}
+              <dt>{{t data.label}}</dt>
+              <dd>
+                {{#if (not data.value)}}
+                  -
+                {{else if (eq data.type "date")}}
+                  {{format-date data.value}}
+                  {{format-time data.value hour="2-digit" minute="2-digit"}}
+                {{else if (eq data.type "user")}}
+                  {{user-name data.value}}
+                {{else}}
+                  {{data.value}}
+                {{/if}}
+              </dd>
+            {{/each}}
+          </dl>
+        </div>
       {{/if}}
-    {{/each}}
+
+    </div>
   </:default>
   <:notfound><CdNotfound /></:notfound>
 </CfContent>

package/addon/components/cd-inquiry-answer-form.js

@@ -1,5 +1,7 @@
+import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
+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";
@@ -15,12 +17,14 @@ export default class CdInquiryAnswerFormComponent extends Component {
   @service router;
   @service abilities;
   @service notification;
+  @service calumaOptions;
 
   @config config;
 
   @queryManager apollo;
 
   @inquiryAnswerStatus({ inquiryProperty: "inquiry" }) answerStatus;
+  @tracked isExpanded = !this.config.ui.small;
 
   _inquiry = trackedTask(this, this.fetchInquiryAnswer, () => [
     this.args.inquiry,
@@ -30,8 +34,13 @@ export default class CdInquiryAnswerFormComponent extends Component {
     return this._inquiry.value?.[0]?.node;
   }
 
+  get inquiryDetails() {
+    return this.config.inquiry.answer.details?.(this.inquiry);
+  }
+
   get buttons() {
     return this.inquiry?.childCase.workItems.edges
+      .filter((edge) => edge.node.status === "READY")
       .map((edge) => {
         const config = this.config.inquiry.answer.buttons[edge.node.task.slug];
 
@@ -52,13 +61,19 @@ export default class CdInquiryAnswerFormComponent extends Component {
       .filter(Boolean);
   }
 
+  @action
+  toggle(e) {
+    e.preventDefault();
+    this.isExpanded = !this.isExpanded;
+  }
+
   @dropTask
-  *fetchInquiryAnswer() {
+  *fetchInquiryAnswer(inquiry) {
     return yield this.apollo.watchQuery(
       {
         query: inquiryAnswerQuery,
         variables: {
-          inquiry: this.args.inquiry,
+          inquiry,
           buttonTasks: Object.keys(this.config.inquiry.answer.buttons),
           infoQuestion: this.config.inquiry.infoQuestion,
           deadlineQuestion: this.config.inquiry.deadlineQuestion,
@@ -79,6 +94,9 @@ export default class CdInquiryAnswerFormComponent extends Component {
           workItem,
           statusQuestion: this.config.inquiry.answer.statusQuestion,
           buttonTasks: Object.keys(this.config.inquiry.answer.buttons),
+          checkTask: this.config.controls.checkTask,
+          currentGroup: String(this.calumaOptions.currentGroupId),
+          answerInfoQuestions: this.config.inquiry.answer.infoQuestions,
         },
       });
 

package/addon/components/cd-inquiry-dialog/inquiry-deadline.hbs

@@ -1,20 +1,15 @@
 {{#if this.deadline.value}}
   <div
-    class="uk-flex-inline uk-flex-middle
-      {{if
-        this.isWithdrawn
-        'uk-text-muted'
-        (concat 'uk-text-' this.deadline.color)
-      }}"
+    class="uk-flex-inline uk-flex-middle uk-text-{{this.deadline.color}}"
+    {{uk-tooltip (t "caluma.distribution.inquiry.deadline")}}
     data-test-deadline
     ...attributes
   >
-    <UkIcon
-      @icon={{if this.isWithdrawn "ban" "clock"}}
-      class="uk-margin-small-right"
-    />
+    <UkIcon @icon={{this.icon}} class="uk-margin-small-right" />
     {{#if this.isWithdrawn}}
       {{t "caluma.distribution.withdraw.status"}}
+    {{else if this.isSkipped}}
+      {{t "caluma.distribution.status.skipped"}}
     {{else}}
       {{format-date this.deadline.value}}
     {{/if}}

package/addon/components/cd-inquiry-dialog/inquiry-deadline.js

@@ -8,7 +8,21 @@ export default class CdInquiryDialogInquiryDeadlineComponent extends Component {
 
   @inquiryDeadline deadline;
 
+  get icon() {
+    if (this.isWithdrawn) {
+      return "ban";
+    } else if (this.isSkipped) {
+      return "lock";
+    }
+
+    return "clock";
+  }
+
   get isWithdrawn() {
     return this.args.inquiry.status === "CANCELED";
   }
+
+  get isSkipped() {
+    return this.args.inquiry.status === "SKIPPED";
+  }
 }

package/addon/components/cd-inquiry-dialog/inquiry-part.hbs

@@ -19,106 +19,135 @@
     {{yield}}
   </div>
 
-  <ul
-    class="uk-subnav uk-subnav-divider
-      {{if
-        this.config.ui.small
-        'uk-margin-remove-top uk-margin-small-bottom'
-        'uk-margin-small-top'
-      }}"
-  >
-    <li>
-      <span>
-        {{format-date this.date}}
-        {{format-time this.date hour="2-digit" minute="2-digit"}}
-      </span>
-    </li>
+  <div class="uk-flex uk-flex-between uk-flex-top">
     {{#unless @disabled}}
-      {{#if (or (eq @type "answer") (cannot "edit inquiry" @inquiry))}}
-        <li>
-          <LinkTo
-            data-test-details
-            @route="inquiry.detail.{{if (eq @type 'answer') 'answer' 'index'}}"
-            @model={{decode-id @inquiry.id}}
-          >
-            {{t "caluma.distribution.details"}}
-          </LinkTo>
-        </li>
-      {{/if}}
-      {{#if (can "edit inquiry" @inquiry)}}
-        <li>
-          <LinkTo
-            data-test-edit
-            @route="inquiry.detail.index"
-            @model={{decode-id @inquiry.id}}
-          >
-            {{t "caluma.distribution.edit.link"}}
-          </LinkTo>
-        </li>
-        {{#if (can "withdraw inquiry" @inquiry)}}
+      <ul
+        class="uk-subnav uk-subnav-divider uk-margin-remove-bottom
+          {{if
+            this.config.ui.small
+            'uk-margin-remove-top'
+            'uk-margin-small-top'
+          }}"
+      >
+        {{#if (or (eq @type "answer") (cannot "edit inquiry" @inquiry))}}
+          <li>
+            <LinkTo
+              data-test-details
+              @route="inquiry.detail.{{if
+                (eq @type 'answer')
+                'answer'
+                'index'
+              }}"
+              @model={{decode-id @inquiry.id}}
+            >
+              {{t "caluma.distribution.details"}}
+            </LinkTo>
+          </li>
+        {{/if}}
+        {{#if (can "edit inquiry" @inquiry)}}
+          <li>
+            <LinkTo
+              data-test-edit
+              @route="inquiry.detail.index"
+              @model={{decode-id @inquiry.id}}
+            >
+              {{t "caluma.distribution.edit.link"}}
+            </LinkTo>
+          </li>
+          {{#if (can "withdraw inquiry" @inquiry)}}
+            <li>
+              <a
+                href=""
+                {{on "click" (perform this.withdraw)}}
+                data-test-withdraw
+              >
+                {{t "caluma.distribution.withdraw.link"}}
+              </a>
+            </li>
+          {{/if}}
+        {{else if (can "answer inquiry" @inquiry)}}
+          <li>
+            <LinkTo
+              data-test-answer
+              @route="inquiry.detail.answer"
+              @model={{decode-id @inquiry.id}}
+            >
+              {{t "caluma.distribution.answer.link"}}
+            </LinkTo>
+          </li>
+        {{/if}}
+        {{#if (and (eq @type "answer") (can "reopen inquiry" @inquiry))}}
+          <li>
+            <a href="" {{on "click" (perform this.reopen)}} data-test-reopen>
+              {{t "caluma.distribution.reopen-inquiry.link"}}
+            </a>
+          </li>
+        {{/if}}
+        {{#if (can "send reminder inquiry" @inquiry)}}
           <li>
             <a
+              data-test-send-reminder
               href=""
-              {{on "click" (perform this.withdraw)}}
-              data-test-withdraw
+              {{on "click" (perform this.sendReminder)}}
             >
-              {{t "caluma.distribution.withdraw.link"}}
+              {{t "caluma.distribution.reminder.link"}}
             </a>
+            <div
+              uk-dropdown="mode: hover; pos: bottom"
+              class="uk-padding-small uk-width-small"
+            >
+              <div class="uk-text-center uk-text-bold uk-margin-small-bottom">
+                {{t "caluma.distribution.reminder.title"}}
+              </div>
+              {{#if @inquiry.meta.reminders}}
+                <div class="uk-height-max-small uk-overflow-auto">
+                  {{#each @inquiry.meta.reminders as |reminder|}}
+                    <div class="uk-text-center uk-text-small uk-text-muted">
+                      {{format-date reminder}}
+                      {{format-time reminder hour="2-digit" minute="2-digit"}}
+                    </div>
+                  {{/each}}
+                </div>
+              {{else}}
+                <div class="uk-text-center">
+                  {{t "caluma.distribution.reminder.no-reminders"}}
+                </div>
+              {{/if}}
+            </div>
           </li>
         {{/if}}
-      {{else if (can "answer inquiry" @inquiry)}}
-        <li>
-          <LinkTo
-            data-test-answer
-            @route="inquiry.detail.answer"
-            @model={{decode-id @inquiry.id}}
-          >
-            {{t "caluma.distribution.answer.link"}}
-          </LinkTo>
-        </li>
-      {{/if}}
-      {{#if (and (eq @type "answer") (can "reopen inquiry" @inquiry))}}
-        <li>
-          <a href="" {{on "click" (perform this.reopen)}} data-test-reopen>
-            {{t "caluma.distribution.reopen-inquiry.link"}}
-          </a>
+      </ul>
+    {{/unless}}
+    <ul
+      class="uk-subnav uk-subnav-divider uk-margin-remove-bottom
+        {{if
+          this.config.ui.small
+          'uk-margin-remove-top'
+          'uk-margin-small-top'
+        }}"
+    >
+      {{#if (and (eq @type "answer") @inquiry.assignedUsers.length)}}
+        <li {{uk-tooltip (t "caluma.distribution.inquiry.assigned-user")}}>
+          <span>{{user-name @inquiry.assignedUsers}}</span>
         </li>
       {{/if}}
-    {{/unless}}
-    {{#if (can "send reminder inquiry" @inquiry)}}
-      <li>
-        <a
-          data-test-send-reminder
-          href=""
-          {{on "click" (perform this.sendReminder)}}
-        >
-          {{t "caluma.distribution.reminder.link"}}
-        </a>
-        <div
-          uk-dropdown="mode: hover; pos: bottom"
-          class="uk-padding-small uk-width-small"
-        >
-          <div class="uk-text-center uk-text-bold uk-margin-small-bottom">
-            {{t "caluma.distribution.reminder.title"}}
-          </div>
-          {{#if @inquiry.meta.reminders}}
-            <div class="uk-height-max-small uk-overflow-auto">
-              {{#each @inquiry.meta.reminders as |reminder|}}
-                <div class="uk-text-center uk-text-small uk-text-muted">
-                  {{format-date reminder}}
-                  {{format-time reminder hour="2-digit" minute="2-digit"}}
-                </div>
-              {{/each}}
-            </div>
-          {{else}}
-            <div class="uk-text-center">
-              {{t "caluma.distribution.reminder.no-reminders"}}
-            </div>
-          {{/if}}
-        </div>
+      <li
+        {{uk-tooltip
+          (if
+            (eq @type "answer")
+            (t "caluma.distribution.inquiry.closed-at")
+            (t "caluma.distribution.inquiry.created-at")
+          )
+        }}
+      >
+        <span>
+          {{format-date this.date}}
+          {{format-time this.date hour="2-digit" minute="2-digit"}}
+        </span>
       </li>
-    {{/if}}
-  </ul>
+    </ul>
+
+  </div>
 
   {{#if this.requestInfo}}
     <CdTruncated

package/addon/components/cd-inquiry-dialog.js

@@ -30,25 +30,24 @@ export default class CdInquiryDialogComponent extends Component {
   _inquiries = trackedTask(this, this.fetchDialog, () => [
     this.args.from,
     this.args.to,
-    this.args.caseId,
+    this.distribution.caseId,
     this.config,
   ]);
 
   @dropTask
-  *fetchDialog() {
+  *fetchDialog(from, to, caseId, config) {
     const response = yield this.apollo.watchQuery({
       query: inquiryDialogQuery,
       variables: {
-        from: this.args.from,
-        to: this.args.to,
-        caseId: this.args.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),
-        includeNavigationData: true,
+        from,
+        to,
+        caseId,
+        task: config.inquiry.task,
+        infoQuestion: config.inquiry.infoQuestion,
+        deadlineQuestion: config.inquiry.deadlineQuestion,
+        statusQuestion: config.inquiry.answer.statusQuestion,
+        answerInfoQuestions: config.inquiry.answer.infoQuestions,
+        buttonTasks: Object.keys(config.inquiry.answer.buttons),
       },
     });
 
@@ -79,9 +78,6 @@ export default class CdInquiryDialogComponent extends Component {
 
     yield this.distribution.createInquiry.perform([this.args.to]);
 
-    // refetch dialog data
-    yield getObservable(this._inquiries.value).refetch();
-
     this.router.transitionTo(
       "inquiry.detail.index",
       {