Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
thirdPartyArchiving
Commits
ef42a494
Commit
ef42a494
authored
Feb 27, 2019
by
Jerome Boucher
Browse files
Merge branch 'fix/8340_DurationDisplay' into 'develop'
Fix/8340 duration display See merge request maarch/thirdPartyArchiving!63
parents
55931d50
7ade38c4
Changes
1
Hide whitespace changes
Inline
Side-by-side
presentation/maarchRM/Presenter/medona/message.php
View file @
ef42a494
...
@@ -324,12 +324,36 @@ class message
...
@@ -324,12 +324,36 @@ class message
}
}
}
}
}
}
if
(
isset
(
$messageObject
->
archive
))
{
foreach
(
$messageObject
->
archive
as
$archive
)
{
if
(
isset
(
$archive
->
appraisalRule
))
{
$dateInter
=
new
\
DateInterval
(
$archive
->
appraisalRule
->
duration
);
$numberDuration
=
0
;
$toDisplay
=
''
;
if
(
$dateInter
->
y
!=
0
)
{
if
(
$dateInter
->
y
==
999999999
)
{
$toDisplay
=
"Unlimited"
;
}
else
{
$numberDuration
=
$dateInter
->
y
;
$toDisplay
=
"Year(s)"
;
}
}
elseif
(
$dateInter
->
m
!=
0
)
{
$numberDuration
=
$dateInter
->
m
;
$toDisplay
=
"Month(s)"
;
}
elseif
(
$dateInter
->
d
!=
0
)
{
$numberDuration
=
$dateInter
->
d
;
$toDisplay
=
"Day(s)"
;
}
$archive
->
appraisalRule
->
durationNumber
=
$numberDuration
;
$archive
->
appraisalRule
->
durationToDisplay
=
$toDisplay
;
}
}
}
$messageObjects
[]
=
$messageObject
;
$messageObjects
[]
=
$messageObject
;
}
}
end
(
$messageObjects
)
->
last
=
true
;
end
(
$messageObjects
)
->
last
=
true
;
$this
->
view
->
addContentFile
(
$baseMessage
->
schema
.
"/message/messageModal.html"
);
$this
->
view
->
addContentFile
(
$baseMessage
->
schema
.
"/message/messageModal.html"
);
$messageDiv
=
$this
->
view
->
getElementById
(
'[?merge .messageId ?]'
);
$messageDiv
=
$this
->
view
->
getElementById
(
'[?merge .messageId ?]'
);
...
@@ -357,7 +381,7 @@ class message
...
@@ -357,7 +381,7 @@ class message
$dataTable
->
setPaginationType
(
"full_numbers"
);
$dataTable
->
setPaginationType
(
"full_numbers"
);
$dataTable
->
setSorting
(
array
(
array
(
0
,
'desc'
)));
$dataTable
->
setSorting
(
array
(
array
(
0
,
'desc'
)));
}
}
$this
->
view
->
setSource
(
'messages'
,
$messageObjects
);
$this
->
view
->
setSource
(
'messages'
,
$messageObjects
);
$this
->
view
->
merge
();
$this
->
view
->
merge
();
...
...
Write
Preview
Markdown
is supported
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