Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
MaarchCourrier
Commits
6b08cf4a
Commit
6b08cf4a
authored
Jun 16, 2021
by
Florian Azizian
Browse files
FIX #17425 TIME 0:10 Display correct mode for interrupted user in visa summary sheet
parent
85e9d344
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/app/resource/controllers/SummarySheetController.php
View file @
6b08cf4a
...
...
@@ -733,7 +733,7 @@ class SummarySheetController
if
(
$found
&&
$listInstance
[
'res_id'
]
!=
$resource
[
'res_id'
])
{
break
;
}
elseif
(
$listInstance
[
'res_id'
]
==
$resource
[
'res_id'
])
{
if
(
!
empty
(
$listInstance
[
'process_date'
]))
{
if
(
!
empty
(
$listInstance
[
'process_date'
])
&&
$listInstance
[
'process_comment'
]
!=
_INTERRUPTED_WORKFLOW
)
{
$mode
=
(
$listInstance
[
'signatory'
]
?
_SIGNATORY
:
_VISA_USER_MIN
);
}
else
{
$mode
=
(
$listInstance
[
'requested_signature'
]
?
_SIGNATORY
:
_VISA_USER_MIN
);
...
...
@@ -778,7 +778,7 @@ class SummarySheetController
$pdf
->
Cell
(
$specialWidth
*
3
,
20
,
_USERS
,
1
,
0
,
'L'
,
false
);
$pdf
->
Cell
(
$specialWidth
,
20
,
_ACTION_DATE
,
1
,
1
,
'L'
,
false
);
foreach
(
$users
as
$keyUser
=>
$user
)
{
$pdf
->
MultiCell
(
$specialWidth
*
3
,
20
,
$keyUser
+
1
.
".
{
$user
[
'user'
]
}
"
,
1
,
'L'
,
false
,
0
,
''
,
''
,
true
,
0
,
false
,
true
,
20
,
'M'
,
true
);
$pdf
->
MultiCell
(
$specialWidth
*
3
,
20
,
$keyUser
+
1
.
".
{
$user
[
'user'
]
}
"
,
1
,
'L'
,
false
,
0
,
''
,
''
,
true
,
0
,
false
,
true
,
20
,
'M'
,
true
);
$pdf
->
Cell
(
$specialWidth
,
20
,
$user
[
'date'
],
1
,
1
,
'L'
,
false
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment