Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LQDN Adminsys
don
Commits
b9d75450
Commit
b9d75450
authored
Jan 10, 2019
by
Okhin
Browse files
Utilisation d'un historique trié complet aulieu de 2
parent
e14996ea
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/controller/perso.php
View file @
b9d75450
...
...
@@ -30,6 +30,7 @@ class Perso extends Controller
$this
->
get_contreparties
(
$f3
);
$this
->
get_dons
(
$f3
);
$this
->
get_recurrents
(
$f3
);
$this
->
compute_history
(
$f3
);
if
(
$f3
->
exists
(
'GET.validate'
))
{
$f3
->
set
(
'modal_counterparts'
,
'1'
);
$f3
->
clear
(
'GET.validate'
);
...
...
@@ -84,6 +85,16 @@ class Perso extends Controller
$f3
->
set
(
'dons_recurrents'
,
$dons
);
}
public
function
compute_history
(
$f3
)
{
$history
=
array
();
$history
=
array_merge
(
$f3
->
get
(
'dons'
),
$f3
->
get
(
'dons_recurrents'
));
usort
(
$history
,
function
(
$a
,
$b
)
{
return
strtotime
(
$a
[
'datec'
])
-
strtotime
(
$b
[
'datec'
]);
});
$f3
->
set
(
'historique'
,
$history
);
}
public
function
login
(
$f3
,
$args
)
{
$f3
->
set
(
'form_visible'
,
'login'
);
...
...
app/view/user/perso.html
View file @
b9d75450
...
...
@@ -141,7 +141,7 @@
<th>
{{ _("Récurent") }}
</th>
<th>
{{ _("Piplome") }}
</th>
</tr>
<repeat
group=
"{{ @
dons_recurrents
}}"
value=
"{{ @don }}"
>
<repeat
group=
"{{ @
historique
}}"
value=
"{{ @don }}"
>
<tr>
<td>
{{ @don.datec }}
</td>
<td>
{{ @don.somme }}
</td>
...
...
@@ -156,22 +156,6 @@
</td>
</tr>
</repeat>
<repeat
group=
"{{ @dons }}"
value=
"{{ @don }}"
>
<tr>
<td>
{{ @don.datec }}
</td>
<td>
{{ @don.somme }}
</td>
<td>
{{ _("Non")}}
</td>
<td>
<check
if=
"{{ @don.pdf == '' }}"
>
<a
href=
"/cron/piplome/{{ @don.id }}"
>
{{ _("Générer") }}
</a>
<false>
<a
href=
"{{ PIPLOME_URL }}/{{ @don.pdf }}.pdf"
target=
"_blank"
>
{{ @pdfs[@don.pdf].decimale }}.pdf
</a>
</false>
</check>
</td>
</tr>
</repeat>
</table>
<table
class=
"table text-left"
>
<tr>
...
...
www/static/css/layouts.css
View file @
b9d75450
...
...
@@ -509,10 +509,6 @@ h4 {
color
:
#3B68B0
;
}
.panel-body
{
height
:
100%
;
}
.panel-body
>
div
{
vertical-align
:
middle
;
display
:
inline-block
;
...
...
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