Commit bac1be2a authored by Paul durand's avatar Paul durand
Browse files

resolve conflicts

parents 4f009292 31056440
......@@ -15,6 +15,6 @@
<img src="assets/spinner.gif"/>
</div>
</app-root>
<script src="runtime-es2015.4ac42fef445445e6f3d0.js" type="module"></script><script src="runtime-es5.4ac42fef445445e6f3d0.js" nomodule defer></script><script src="polyfills-es5.8c2a86db22bc37211976.js" nomodule defer></script><script src="polyfills-es2015.f8f86766446f4344eec7.js" type="module"></script><script src="scripts.3f995a62571f9f668311.js" defer></script><script src="main-es2015.b12224daa626c3272390.js" type="module"></script><script src="main-es5.b12224daa626c3272390.js" nomodule defer></script></body>
<script src="runtime-es2015.4ac42fef445445e6f3d0.js" type="module"></script><script src="runtime-es5.4ac42fef445445e6f3d0.js" nomodule defer></script><script src="polyfills-es5.7fae827c7a50dd82ce0c.js" nomodule defer></script><script src="polyfills-es2015.f8f86766446f4344eec7.js" type="module"></script><script src="scripts.3f995a62571f9f668311.js" defer></script><script src="main-es2015.29a1164adc0a02fb3fed.js" type="module"></script><script src="main-es5.29a1164adc0a02fb3fed.js" nomodule defer></script></body>
</html>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -338,7 +338,7 @@ export class SignatureBookComponent implements OnInit, OnDestroy {
}
canChange(assignedBasket: any) {
const usersHasNotSigned: any[] = this.appVisaWorkflow.visaWorkflow.items.filter((user: any) => user.process_date === null);
const usersHasNotSigned: any[] = this.appVisaWorkflow.getWorkflow().filter((user: any) => this.functions.empty(user.process_date));
if (assignedBasket === undefined) {
return usersHasNotSigned[0].item_id !== this.headerService.user.id;
} else {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment