Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Trèfle
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Open source
Trèfle
Commits
ba4f1f98
Commit
ba4f1f98
authored
Mar 17, 2020
by
David Foucher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'beautify-rules' into 'vue-editor'
Fixing bugs See merge request
!26
parents
5b8924e8
c4e1a73d
Pipeline
#2376
passed with stages
in 9 minutes and 21 seconds
Changes
7
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
90 additions
and
42 deletions
+90
-42
backoffice/src/App.vue
backoffice/src/App.vue
+13
-0
backoffice/src/components/Accueil.vue
backoffice/src/components/Accueil.vue
+26
-16
backoffice/src/components/Financements.vue
backoffice/src/components/Financements.vue
+1
-1
backoffice/src/components/Modification.vue
backoffice/src/components/Modification.vue
+2
-1
backoffice/src/components/Referentiel.vue
backoffice/src/components/Referentiel.vue
+4
-4
backoffice/src/components/Rule.vue
backoffice/src/components/Rule.vue
+43
-19
backoffice/vue.config.js
backoffice/vue.config.js
+1
-1
No files found.
backoffice/src/App.vue
View file @
ba4f1f98
...
@@ -201,6 +201,19 @@
...
@@ -201,6 +201,19 @@
background-color
:
#384EAA
;
background-color
:
#384EAA
;
color
:
white
;
color
:
white
;
}
}
.main-button
:hover:disabled
{
border
:
1px
solid
#384EAA
;
background-color
:
#BDBADE
;
color
:
black
;
}
.main-button-primary
{
background-color
:
#384EAA
;
color
:
white
;
}
.main-button-primary
:hover
{
background-color
:
#0D0850
;
color
:
white
;
}
.loading-gif
{
.loading-gif
{
padding-top
:
8rem
;
padding-top
:
8rem
;
}
}
...
...
backoffice/src/components/Accueil.vue
View file @
ba4f1f98
...
@@ -12,29 +12,36 @@
...
@@ -12,29 +12,36 @@
</div>
</div>
</div>
</div>
<div
class=
"row mt-3"
>
<div
class=
"row mt-3"
>
<div
class=
"col-md-4"
>
<div
class=
"col-md-4
col-sm-12
"
>
<div
id=
"chart-container"
>
<div
id=
"chart-container"
>
<ModificationChart
@
on-receive=
"update"
:values=
"modification_chart_datas.datasets"
:labels=
"modification_chart_datas.labels"
></ModificationChart>
<ModificationChart
@
on-receive=
"update"
:values=
"modification_chart_datas.datasets"
:labels=
"modification_chart_datas.labels"
></ModificationChart>
</div>
</div>
</div>
</div>
<div
class=
"col-md-8"
>
<div
v-if=
"!isLoading"
>
<div
id=
"modification_list"
>
<div
class=
"col-md-8 col-sm-12"
>
<div
v-if=
"selected_rule"
>
<div
id=
"modification_list"
>
<h5>
Modification(s) de la règle
{{
selected_rule
}}
(
{{
Object
.
keys
(
selected_modification_list
).
length
}}
)
</h5>
<div
v-if=
"selected_rule"
>
<ul
v-for=
"modification in selected_modification_list"
:key=
"modification.id"
class=
"dash"
>
<h5>
Modification(s) de la règle en cours de validation
{{
selected_rule
}}
(
{{
Object
.
keys
(
selected_modification_list
).
length
}}
)
</h5>
<li>
<ul
v-for=
"modification in selected_modification_list"
:key=
"modification.id"
class=
"dash"
>
<a
:href=
"'referentiel#'+selected_rule+'.rules#modified'"
>
{{
modification
.
title
}}
</a>
<li>
</li>
<a
:href=
"'referentiel#'+selected_rule+'.rules#modified'"
>
{{
modification
.
title
}}
</a>
</ul>
</li>
</div>
</ul>
<div
v-else
>
</div>
<h5>
Toutes les modifications (
{{
Object
.
keys
(
modification_list
).
length
}}
)
</h5>
<div
v-else
>
<ul
v-for=
"modification in modification_list"
:key=
"modification.id"
class=
"dash"
>
<h5>
Toutes les modifications en cours de validation (
{{
Object
.
keys
(
modification_list
).
length
}}
)
</h5>
<li>
{{
modification
.
title
}}
</li>
<ul
v-for=
"modification in modification_list"
:key=
"modification.id"
class=
"dash"
>
</ul>
<li>
<a
:href=
"'referentiel#'+modification.file.split('/').pop().split('.')[0]+'.rules#modified'"
>
{{
modification
.
title
}}
- (
{{
modification
.
file
.
split
(
'
/
'
).
pop
().
split
(
'
.
'
)[
0
]
}}
)
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div
v-else
class=
"text-center loading-gif"
>
<img
src=
"./../assets/images/loading.gif"
alt=
"loading..."
>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -54,6 +61,7 @@
...
@@ -54,6 +61,7 @@
selected_modification_list
:
{},
selected_modification_list
:
{},
selected_rule
:
''
,
selected_rule
:
''
,
test
:
0
,
test
:
0
,
isLoading
:
true
,
}
}
},
},
beforeMount
:
function
()
{
beforeMount
:
function
()
{
...
@@ -65,9 +73,11 @@
...
@@ -65,9 +73,11 @@
.
get
(
'
/source/modified
'
)
.
get
(
'
/source/modified
'
)
.
then
(
response
=>
{
.
then
(
response
=>
{
this
.
modification_list
=
response
.
body
;
this
.
modification_list
=
response
.
body
;
this
.
isLoading
=
false
;
return
true
;
return
true
;
},
response
=>
{
},
response
=>
{
if
(
response
.
status
==
500
)
this
.
modification_list
=
{};
if
(
response
.
status
==
500
)
this
.
modification_list
=
{};
this
.
isLoading
=
false
;
return
false
;
return
false
;
})
})
},