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
Admin message
A compter du 1er avril, attention à vos pipelines :
Nouvelles limitations de Docker Hub
Show more breadcrumbs
Cassiopée
nghyd
Commits
8f2a1715
Commit
8f2a1715
authored
6 years ago
by
mathias.chouet
Browse files
Options
Downloads
Patches
Plain Diff
Fix
#183
parent
bc36bc59
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!40
Resolve "Amélioration du système de paramètres liés"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/app/formulaire/ngparam.ts
+3
-1
3 additions, 1 deletion
src/app/formulaire/ngparam.ts
src/locale/messages.en.json
+1
-0
1 addition, 0 deletions
src/locale/messages.en.json
src/locale/messages.fr.json
+1
-0
1 addition, 0 deletions
src/locale/messages.fr.json
with
5 additions
and
1 deletion
src/app/formulaire/ngparam.ts
+
3
−
1
View file @
8f2a1715
...
...
@@ -98,6 +98,7 @@ export class NgParameter extends InputField implements Observer {
// calculated param ?
if
(
targetParam
.
valueMode
===
ParamValueMode
.
CALCUL
)
{
// was the result already computed ?
// @WAARNING .result might be set but the computation might have failed (dichotomy for ex.)
if
(
p
.
referencedValue
.
nub
.
result
)
{
if
(
p
.
referencedValue
.
hasMultipleValues
())
{
// like LIST mode
...
...
@@ -110,7 +111,8 @@ export class NgParameter extends InputField implements Observer {
if
(
vCalc
)
{
valuePreview
=
String
(
vCalc
.
toFixed
(
nDigits
));
}
else
{
throw
new
Error
(
"
NgParameter.preview() : No vCalc for computed target Nub !
"
);
// computation has been run but has failed
valuePreview
=
i18n
.
localizeText
(
"
INFO_PARAMFIELD_CALCULATION_FAILED
"
);
}
}
}
else
{
...
...
This diff is collapsed.
Click to expand it.
src/locale/messages.en.json
+
1
−
0
View file @
8f2a1715
...
...
@@ -159,6 +159,7 @@
"INFO_PARAMFIELD_GRAPH_TYPE_HISTOGRAM"
:
"Histogram"
,
"INFO_PARAMFIELD_GRAPH_SELECT_X_AXIS"
:
"Variable for X axis"
,
"INFO_PARAMFIELD_GRAPH_SELECT_Y_AXIS"
:
"Variable for Y axis"
,
"INFO_PARAMFIELD_CALCULATION_FAILED"
:
"Calculation failed"
,
"INFO_PARAMFIELD_IN_CALCULATION"
:
"In calculation"
,
"INFO_PARAMFIELD_IN_CALCULATION_INITIAL_VALUE"
:
"initial value"
,
"INFO_PARAMFIELD_PARAMCALCULER"
:
"Calculate"
,
...
...
This diff is collapsed.
Click to expand it.
src/locale/messages.fr.json
+
1
−
0
View file @
8f2a1715
...
...
@@ -159,6 +159,7 @@
"INFO_PARAMFIELD_GRAPH_TYPE_HISTOGRAM"
:
"Histogramme"
,
"INFO_PARAMFIELD_GRAPH_SELECT_X_AXIS"
:
"Variable en abscisse"
,
"INFO_PARAMFIELD_GRAPH_SELECT_Y_AXIS"
:
"Variable en ordonnée"
,
"INFO_PARAMFIELD_CALCULATION_FAILED"
:
"Échec du calcul"
,
"INFO_PARAMFIELD_IN_CALCULATION"
:
"En calcul"
,
"INFO_PARAMFIELD_IN_CALCULATION_INITIAL_VALUE"
:
"valeur initiale"
,
"INFO_PARAMFIELD_PARAMCALCULER"
:
"calculer"
,
...
...
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