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
6d0a8690
Commit
6d0a8690
authored
Jun 22, 2020
by
Lucas Détré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
now possible to edit the simulation by going back to the form view + minor fix on Accueil view
parent
58b8968d
Pipeline
#3446
passed with stage
in 1 minute and 25 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
17 deletions
+20
-17
backoffice/src/components/Accueil.vue
backoffice/src/components/Accueil.vue
+1
-1
backoffice/src/components/Simulateur.vue
backoffice/src/components/Simulateur.vue
+6
-10
backoffice/src/components/SimulateurResultats.vue
backoffice/src/components/SimulateurResultats.vue
+10
-2
backoffice/src/components/SimulateurStepFormation.vue
backoffice/src/components/SimulateurStepFormation.vue
+3
-4
No files found.
backoffice/src/components/Accueil.vue
View file @
6d0a8690
...
...
@@ -38,7 +38,7 @@
<div
class=
"row"
>
<div
class=
"col-md-12 mt-5"
>
<div
id=
"chart-container"
class=
"text-center"
>
<ModificationChart
width=
"1200"
height=
"200"
@
on-receive=
"update"
:values=
"modification_chart_datas.datasets"
:labels=
"modification_chart_datas.labels"
></ModificationChart>
<ModificationChart
:width=
"1200"
:
height=
"200"
@
on-receive=
"update"
:values=
"modification_chart_datas.datasets"
:labels=
"modification_chart_datas.labels"
></ModificationChart>
</div>
</div>
<div
class=
"col-md-12"
>
...
...
backoffice/src/components/Simulateur.vue
View file @
6d0a8690
...
...
@@ -10,7 +10,7 @@
<hr
class=
"simulateur-horizontal-separator"
>
<!---------------- STEP FORMATION ---------------->
<div
class=
"formation-step step"
:class=
"
{step_completed_class: formation_step_completed}">
<SimulateurStepFormation/>
<SimulateurStepFormation
:id_formation=
"formation.numero"
/>
</div>
<hr
v-if=
"formation_step_completed"
class=
"simulateur-horizontal-separator"
>
<!---------------- STEP ONE ---------------->
...
...
@@ -46,7 +46,7 @@
<!------------------- RESULTATS -------------->
<div
v-if=
"resultats"
id=
"simulate-results"
>
<div
v-if=
"!isLoading"
class=
"mt-5"
>
<SimulateurResultats
:schema=
"schema"
:financements=
"financements"
:financements_eligibles=
"financements_eligibles"
:scenario=
"scenario"
:context=
"context"
></SimulateurResultats>
<SimulateurResultats
:schema=
"schema"
:financements=
"financements"
:financements_eligibles=
"financements_eligibles"
:scenario=
"scenario"
:context=
"context"
:id_formation=
"formation.numero"
></SimulateurResultats>
</div>
<div
v-else
class=
"text-center loading-gif"
>
<img
src=
"./../assets/images/loading.gif"
alt=
"loading..."
>
...
...
@@ -256,8 +256,8 @@
inscrit_pe
:
this
.
situation_inscrit
==
2
?
false
:
true
,
solde_cpf
:
this
.
situation_creditheurescpf
==
''
?
0
:
this
.
situation_creditheurescpf
,
remuneration
:
this
.
salaire
==
''
?
0
:
this
.
salaire
,
allocation
:
this
.
allocation_cost
==
''
?
0
:
this
.
allocation_cost
,
type_allocation
:
this
.
allocation_type
,
allocation
:
this
.
allocation_cost
==
''
?
0
:
this
.
allocation_cost
,
type_allocation
:
this
.
allocation_type
==
'
non
'
?
null
:
this
.
allocation_type
,
fin_allocation
:
this
.
allocation_dateend
,
naissance
:
this
.
birthdate
,
age
:
this
.
age_beneficiaire
,
...
...
@@ -365,15 +365,11 @@
simulate
:
function
()
{
this
.
isLoading
=
true
;
var
context
=
null
;
if
(
this
.
context
)
{
context
=
this
.
context
}
else
{
if
(
!
this
.
objectIsEmpty
(
this
.
context
))
{
this
.
prepareRequest
()
context
=
this
.
request
}
this
.
$http
.
post
(
'
/financement?context=1&explain=true&scenario=1
'
,
contex
t
).
then
(
response
=>
{
this
.
$http
.
post
(
'
/financement?context=1&explain=true&scenario=1
'
,
this
.
reques
t
).
then
(
response
=>
{
if
(
this
.
objectIsEmpty
(
response
.
body
)
==
false
)
{
for
(
var
i
=
0
;
i
<
response
.
body
.
financements
.
length
-
1
;
i
++
)
{
if
(
this
.
situation_cpfconnu
==
'
cpfempty
'
)
{
...
...
backoffice/src/components/SimulateurResultats.vue
View file @
6d0a8690
...
...
@@ -5,7 +5,10 @@
<div
class=
"col-md-12"
>
<h2>
Résultats de simulation de financement
<button
v-on:click=
"newSimulation();"
class=
"btn main-button-primary pull-right"
><span
class=
"mr-1"
>
Nouvelle simulation
</span><i
class=
"ml-1 fas fa-redo"
></i></button>
<div
class=
"pull-right inline"
>
<button
v-on:click=
"editSimulation();"
class=
"btn main-button-primary mr-3"
><span
class=
"mr-1"
>
Editer la simulation
</span><i
class=
"ml-1 fas fa-edit"
></i></button>
<button
v-on:click=
"newSimulation();"
class=
"btn main-button-primary"
><span
class=
"mr-1"
>
Nouvelle simulation
</span><i
class=
"ml-1 fas fa-redo"
></i></button>
</div>
</h2>
</div>
</div>
...
...
@@ -151,7 +154,7 @@
SimulateurExplain
,
SimulateurContext
},
props
:
[
'
schema
'
,
'
financements
'
,
'
financements_eligibles
'
,
'
scenario
'
,
'
context
'
,
'
isLoading
'
],
props
:
[
'
schema
'
,
'
financements
'
,
'
financements_eligibles
'
,
'
scenario
'
,
'
context
'
,
'
isLoading
'
,
'
id_formation
'
],
data
:
function
()
{
return
{
scenarioToggled
:
false
,
...
...
@@ -162,6 +165,11 @@
methods
:
{
newSimulation
:
function
()
{
location
.
reload
();
},
editSimulation
:
function
()
{
this
.
$parent
.
resultats
=
false
;
this
.
$parent
.
financements_eligibles
=
[];
this
.
$parent
.
formation
.
numero
=
this
.
id_formation
;
}
}
...
...
backoffice/src/components/SimulateurStepFormation.vue
View file @
6d0a8690
...
...
@@ -18,11 +18,10 @@
</
template
>
<
script
>
export
default
{
name
:
'
SimulateurStepFormation
'
,
props
:[],
name
:
'
SimulateurStepFormation
'
,
props
:[
"
id_formation
"
],
data
:
function
()
{
return
{
id_formation
:
null
,
formationNotExists
:
null
,
intitule_formation
:
null
,
}
...
...
@@ -46,7 +45,7 @@
},
(
response
)
=>
{
this
.
formationNotExists
=
response
.
status
!=
200
;
}).
created
;
},
},
}
}
</
script
>
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