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
00ca3138
Commit
00ca3138
authored
Jul 17, 2020
by
David Foucher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-sonarQube-bugs' into 'master'
Fix sonar qube bugs See merge request
!77
parents
46329101
70dfca7a
Pipeline
#3649
passed with stage
in 2 minutes and 1 second
Changes
14
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
129 additions
and
111 deletions
+129
-111
backoffice/src/components/Financements/Financements.vue
backoffice/src/components/Financements/Financements.vue
+2
-18
backoffice/src/components/Outils/CatalogueSearch.vue
backoffice/src/components/Outils/CatalogueSearch.vue
+1
-2
backoffice/src/components/Outils/CertifInfoSearch.vue
backoffice/src/components/Outils/CertifInfoSearch.vue
+1
-2
backoffice/src/components/Outils/IDCCSearch.vue
backoffice/src/components/Outils/IDCCSearch.vue
+1
-2
backoffice/src/components/Outils/NAFSearch.vue
backoffice/src/components/Outils/NAFSearch.vue
+1
-2
backoffice/src/components/Referentiel/Referentiel.vue
backoffice/src/components/Referentiel/Referentiel.vue
+1
-2
backoffice/src/components/Referentiel/Rule.vue
backoffice/src/components/Referentiel/Rule.vue
+1
-1
backoffice/src/components/Simulateur/Simulateur.vue
backoffice/src/components/Simulateur/Simulateur.vue
+25
-21
backoffice/src/components/Simulateur/SimulateurContext.vue
backoffice/src/components/Simulateur/SimulateurContext.vue
+27
-10
backoffice/src/components/Simulateur/SimulateurExplain.vue
backoffice/src/components/Simulateur/SimulateurExplain.vue
+19
-18
backoffice/src/components/Simulateur/SimulateurResultats.vue
backoffice/src/components/Simulateur/SimulateurResultats.vue
+39
-23
backoffice/src/components/Simulateur/SimulateurStepFive.vue
backoffice/src/components/Simulateur/SimulateurStepFive.vue
+5
-5
backoffice/src/components/Simulateur/SimulateurStepFormation.vue
...ice/src/components/Simulateur/SimulateurStepFormation.vue
+5
-4
backoffice/vue.config.js
backoffice/vue.config.js
+1
-1
No files found.
backoffice/src/components/Financements/Financements.vue
View file @
00ca3138
...
...
@@ -13,18 +13,10 @@
<div
id=
"financement-create-financement"
class=
"col-md-6 col-sm-12 col-xs-12 my-auto"
>
<div
class=
"form-inline pull-right"
>
<div
class=
"form-group mx-sm-3 mb-2"
>
<!--
<input
type=
"button"
href=
"#"
class=
"btn main-button form-control"
value=
"Créer un financement"
disabled
/>
-->
</div>
</div>
</div>
</div>
<!--
<div
class=
"row"
>
<div
id=
"financement-last-update"
class=
"col-md-12"
>
Dernière mise à jour le __ à __
</div>
</div>
-->
</div>
</div>
<hr
class=
"financement-horizontal-separator"
>
...
...
@@ -83,13 +75,6 @@
</span>
</span>
</span>
<!--
<span
class=
"col-md-1 col-sm-1 pull-right"
>
<button
href=
"https://git.beta.pole-emploi.fr/open-source/trefle/edit/master/trefle/config/financements.yml"
target=
"_blank"
class=
"text-dark btn btn-outline-light"
disabled
>
<i
class=
"icon"
style=
"vertical-align: baseline;"
>
edit
</i>
</button>
</span>
-->
</li>
</ul>
</div>
...
...
@@ -143,8 +128,7 @@
this
.
financements
=
response
.
body
;
this
.
filteredFinancements
=
response
.
body
;
this
.
isLoading
=
false
;
})
.
created
;
});
},
setSearchTag
:
function
(
tag
)
{
this
.
search
=
tag
;
...
...
@@ -160,7 +144,7 @@
isCaseSensitive
?
searchRegExp
=
new
RegExp
(
searchWithoutAccents
,
"
g
"
)
:
searchRegExp
=
new
RegExp
(
searchWithoutAccents
,
'
ig
'
)
return
searchType
!=
"
input
"
?
this
.
filterable
(
""
,
financement
.
tags
).
match
(
searchRegExp
)
:
this
.
filterable
(
financement
.
intitule
,
financement
.
tags
).
match
(
searchRegExp
)
}
return
true
return
true
;
})
},
filterable
:
function
(
intitule
,
tags
)
{
...
...
backoffice/src/components/Outils/CatalogueSearch.vue
View file @
00ca3138
...
...
@@ -43,8 +43,7 @@
this
.
resultsIsEmpty
=
this
.
isEmpty
(
this
.
results
);
},
()
=>
{
this
.
resultsIsEmpty
=
this
.
isEmpty
(
this
.
results
);
})
.
created
;
});
},
isEmpty
:
function
(
obj
)
{
for
(
var
key
in
obj
)
{
...
...
backoffice/src/components/Outils/CertifInfoSearch.vue
View file @
00ca3138
...
...
@@ -43,8 +43,7 @@
.
then
(
response
=>
{
this
.
results
=
response
.
body
;
this
.
resultsIsEmpty
=
this
.
isEmpty
(
this
.
results
);
})
.
created
;
});
},
isEmpty
:
function
(
obj
)
{
for
(
var
key
in
obj
)
{
...
...
backoffice/src/components/Outils/IDCCSearch.vue
View file @
00ca3138
...
...
@@ -44,8 +44,7 @@
.
then
(
response
=>
{
this
.
results
=
response
.
body
;
this
.
resultsIsEmpty
=
this
.
isEmpty
(
this
.
results
);
})
.
created
;
});
},
isEmpty
:
function
(
obj
)
{
for
(
var
key
in
obj
)
{
...
...
backoffice/src/components/Outils/NAFSearch.vue
View file @
00ca3138
...
...
@@ -43,8 +43,7 @@
.
then
(
response
=>
{
this
.
results
=
response
.
body
;
this
.
resultsIsEmpty
=
this
.
isEmpty
(
this
.
results
);
})
.
created
;
});
},
isEmpty
:
function
(
obj
)
{
for
(
var
key
in
obj
)
{
...
...
backoffice/src/components/Referentiel/Referentiel.vue
View file @
00ca3138
...
...
@@ -133,8 +133,7 @@
.
then
(
response
=>
{
this
.
rules
=
response
.
body
;
this
.
isLoading
=
false
;
})
.
created
;
});
},
forceRerender
:
function
()
{
this
.
rerenderKey
+=
1
;
...
...
backoffice/src/components/Referentiel/Rule.vue
View file @
00ca3138
...
...
@@ -279,7 +279,7 @@
email
:
''
,
password
:
''
,
file
:
this
.
path
}
,
}
;
this
.
isEditMode
=
false
;
if
(
this
.
modification_count
!=
0
)
this
.
viewModification
=
true
;
this
.
error_flags
=
{
...
...
backoffice/src/components/Simulateur/Simulateur.vue
View file @
00ca3138