Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nghyd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Cassiopée
nghyd
Commits
50b72f15
Commit
50b72f15
authored
2 years ago
by
François Grand
Browse files
Options
Downloads
Patches
Plain Diff
fix: variable results graph: select entries not translated when modifying langage setting
refs
#586
parent
73dedf3e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!225
Release v4.17.0
,
!205
Resolve "Traduction des résultats : tous les libellés ne sont pas modifiés quand on change de langue"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/components/fixedvar-results/var-results.component.ts
+6
-2
6 additions, 2 deletions
src/app/components/fixedvar-results/var-results.component.ts
src/app/results/param-calc-results.ts
+13
-3
13 additions, 3 deletions
src/app/results/param-calc-results.ts
with
19 additions
and
5 deletions
src/app/components/fixedvar-results/var-results.component.ts
+
6
−
2
View file @
50b72f15
import
{
Component
,
ViewChild
,
ElementRef
,
Input
}
from
"
@angular/core
"
;
import
{
Component
,
ViewChild
,
ElementRef
,
Input
,
OnInit
}
from
"
@angular/core
"
;
import
{
MatDialog
}
from
"
@angular/material/dialog
"
;
...
...
@@ -17,7 +17,7 @@ import { longestVarParam } from "../../../app/util";
"
./var-results.component.scss
"
]
})
export
class
VarResultsComponent
extends
ResultsComponentDirective
implements
Observer
{
export
class
VarResultsComponent
extends
ResultsComponentDirective
implements
Observer
,
OnInit
{
/** size of the longest variated parameter */
public
size
:
number
;
...
...
@@ -196,6 +196,10 @@ export class VarResultsComponent extends ResultsComponentDirective implements Ob
);
}
ngOnInit
():
void
{
this
.
_varResults
.
updateCalculatedParameterHeader
();
}
// Observer interface
update
(
sender
:
any
,
data
:
any
):
void
{
...
...
This diff is collapsed.
Click to expand it.
src/app/results/param-calc-results.ts
+
13
−
3
View file @
50b72f15
...
...
@@ -12,7 +12,7 @@ export abstract class CalculatedParamResults extends CalculatorResults {
protected
_calculatedParam
:
NgParameter
;
/** titre de la colonne du paramètre calculé */
p
ublic
calculatedParameterHeader
:
string
;
p
rivate
_
calculatedParameterHeader
:
string
;
/** résultat du calcul sur le paramètre calculé */
public
result
:
Result
;
...
...
@@ -22,7 +22,7 @@ export abstract class CalculatedParamResults extends CalculatorResults {
public
reset
()
{
this
.
_calculatedParam
=
undefined
;
this
.
calculatedParameterHeader
=
undefined
;
this
.
_
calculatedParameterHeader
=
undefined
;
this
.
result
=
undefined
;
}
...
...
@@ -32,7 +32,17 @@ export abstract class CalculatedParamResults extends CalculatorResults {
public
set
calculatedParameter
(
p
:
NgParameter
)
{
this
.
_calculatedParam
=
p
;
this
.
calculatedParameterHeader
=
CalculatorResults
.
paramLabel
(
this
.
_calculatedParam
,
true
);
this
.
updateCalculatedParameterHeader
();
}
public
updateCalculatedParameterHeader
()
{
if
(
this
.
_calculatedParam
!==
undefined
)
{
this
.
_calculatedParameterHeader
=
CalculatorResults
.
paramLabel
(
this
.
_calculatedParam
,
true
);
}
}
public
get
calculatedParameterHeader
():
string
{
return
this
.
_calculatedParameterHeader
;
}
public
get
hasResults
():
boolean
{
...
...
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