@bizdoc/core 1.15.0 → 1.15.1

package/fesm2020/bizdoc-core.mjs

@@ -14638,19 +14638,13 @@ class FlowViewComponent extends TraceBase {
                     role = `- ${by.role}`;
             }
         }
+        else if (this.model.ownerId === this._session.userId)
+            note = this._translate.get('YouSubmittedNote', ago);
         else {
-            if (this.model.ownerId === this._session.userId) {
-                if (this._session.isImpersonating)
-                    note = this._translate.personalize('SubmittedNote', this._session.profile.gender, this._session.profile.name, ago);
-                else
-                    note = this._translate.get('YouSubmittedNote', ago);
-            }
-            else {
-                const who = await this._accounts.get(this.model.ownerId).toPromise();
-                note = this._translate.personalize('SubmittedNote', who.gender, who.name, ago);
-                if (who.role)
-                    role = `- ${who.role}`;
-            }
+            const who = await this._accounts.get(this.model.ownerId).toPromise();
+            note = this._translate.personalize('SubmittedNote', who.gender, who.name, ago);
+            if (who.role)
+                role = `- ${who.role}`;
         }
         return { note, role };
     }
@@ -21705,10 +21699,10 @@ let ReturnActionComponent = class ReturnActionComponent {
             recipientId: this._fb.control(null, Validators.required),
             note: this._fb.control(null, Validators.maxLength(200))
         });
-        const recipient = actionRef.item.recipients.find(r => r.id === actionRef.item.id), node = actionRef.item.workflow.nodes.find(n => n.id === recipient.nodeId);
+        const recipient = actionRef.item.recipients.find(r => r.id === actionRef.item.id);
         actionRef.item.recipients.slice(1).
             filter(r => r.userId !== session.profile.userId && !r.estimate && !r.pending
-            && r.received >= actionRef.item.issued && r.received <= node.time).
+            && r.received >= actionRef.item.issued && r.received < recipient.received).
             reverse().forEach(r => this.recipients.findIndex(i => i.userId === r.userId) < 0 &&
             this.recipients.push(r));
     }