Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OSE
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
OSE
Commits
62740407
You need to sign in or sign up before continuing.
Commit
62740407
authored
1 year ago
by
Antony Le Courtes
Browse files
Options
Downloads
Patches
Plain Diff
correction #50738
(cherry picked from commit
920a53bf
)
parent
69d8e232
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
module/Paiement/view/paiement/budget/engagements-liquidation.phtml
+49
-43
49 additions, 43 deletions
...iement/view/paiement/budget/engagements-liquidation.phtml
public/css/app.css
+22971
-18616
22971 additions, 18616 deletions
public/css/app.css
public/css/budget.scss
+20
-30
20 additions, 30 deletions
public/css/budget.scss
with
23040 additions
and
18689 deletions
module/Paiement/view/paiement/budget/engagements-liquidation.phtml
+
49
−
43
View file @
62740407
...
...
@@ -21,16 +21,18 @@ if ($structureElement) {
<?php
if
(
$structure
)
:
?>
<div
class=
"engagement"
>
<div
class=
"row"
>
<!-- Abondements par types de ressources -->
<?php
foreach
(
$dotations
[
'typesRessources'
]
as
$dtr
)
:
$canEdit
=
$this
->
isAllowed
(
$dtr
[
'entity'
],
$dtr
[
'entity'
]
->
getPrivilegeBudgetEdition
());
?>
<div
class=
"col-md-
<?=
floor
(
12
/
count
(
$dotations
[
'typesRessources'
]))
?>
"
>
<div
class=
"col-md-
6
"
>
<h2>
<?=
$dtr
[
'entity'
]
->
getLibelle
()
?>
</h2>
<table
class=
"table table-bordered table-hover"
>
<?php
foreach
(
$dtr
[
'abondements'
]
as
$libelle
=>
$abondement
)
:
?>
<tr>
<t
h
>
<?=
$abondement
[
'libelle'
]
?>
</t
h
>
<t
d
>
<?=
$abondement
[
'libelle'
]
?>
</t
d
>
<td
class=
"dotation"
>
<?php
fdot
(
$this
,
$dtr
[
'entity'
],
$libelle
,
$abondement
,
$canEdit
)
?>
</td>
</tr>
<?php
endforeach
;
?>
...
...
@@ -41,9 +43,9 @@ if ($structureElement) {
</table>
</div>
<?php
endforeach
;
?>
</div>
<!-- Liquidation -->
<div
class=
"liquidation"
>
<div
class=
"liquidation
row
"
>
<h2>
Liquidation
</h2>
<table
class=
"table table-bordered"
>
<tr>
...
...
@@ -126,8 +128,9 @@ if ($structureElement) {
}
?>
<div
class=
"ha ha1 col-md-6"
title=
"
<?=
$titleA1
?>
"
>
<div
class=
"container"
>
<div
class=
"row"
>
<div
class=
"ha ha1 col"
title=
"
<?=
$titleA1
?>
"
>
<?=
Util
::
formattedNumber
(
$data
[
'anneeCivile1'
][
'heures'
])
?>
<span
class=
"label"
>
HETD
</span>
<?php
if
(
$canEdit
)
:
?>
<a
href=
"
<?=
$dotEditUrl1
?>
"
class=
"mod-ajax"
data-submit-reload=
"true"
...
...
@@ -136,7 +139,7 @@ if ($structureElement) {
</a>
<?php
endif
;
?>
</div>
<div
class=
"ha ha2 col
-md-6
"
title=
"
<?=
$titleA2
?>
"
>
<div
class=
"ha ha2 col"
title=
"
<?=
$titleA2
?>
"
>
<?=
Util
::
formattedNumber
(
$data
[
'anneeCivile2'
][
'heures'
])
?>
<span
class=
"label"
>
HETD
</span>
<?php
if
(
$canEdit
)
:
?>
<a
href=
"
<?=
$dotEditUrl2
?>
"
class=
"mod-ajax"
data-submit-reload=
"true"
...
...
@@ -145,9 +148,12 @@ if ($structureElement) {
</a>
<?php
endif
;
?>
</div>
<div
class=
"ha ha3 col-md-offset-3 col-md-6"
title=
"
<?=
$titleA
?>
"
>
</div>
<div
class=
"row"
>
<div
class=
"ha ha3 col"
title=
"
<?=
$titleA
?>
"
>
<?=
Util
::
formattedNumber
(
$data
[
'heures'
])
?>
<span
class=
"label"
>
HETD
</span>
</div>
</div>
</div>
<?php
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
public/css/app.css
+
22971
−
18616
View file @
62740407
This diff is collapsed.
Click to expand it.
public/css/budget.scss
+
20
−
30
View file @
62740407
.engagement
.ha
{
border-collapse
:
collapse
;
border
:
1px
gray
solid
;
border
:
1px
#dfdddd
solid
;
text-align
:
right
;
margin
:
0
;
}
.engagement
.label
{
...
...
@@ -12,17 +13,11 @@
.engagement
.ha.ha2
{
border-left
:
none
;
}
.engagement
.ha.ha3
{
border-top
:
none
}
.engagement
td
.dotation
{
padding
:
.2em
;
}
.engagement
td
.dotation
{
padding
:
.2em
;
}
.engagement
td
.hetd
{
text-align
:
right
;
...
...
@@ -42,11 +37,6 @@
text-align
:
center
;
}
.engagement
.liquidation
table
{
width
:
auto
;
margin
:auto
;
}
table
.budget-tbl
{
width
:
auto
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment