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
68ddb3c3
Commit
68ddb3c3
authored
2 years ago
by
François Grand
Browse files
Options
Downloads
Patches
Plain Diff
feat: predams: apply event processing to basin move functionnalities
refs
#522
parent
c1d828b9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!166
Resolve "Prébarrages: Regroupement de la saisie des bassins"
Pipeline
#139825
passed
2 years ago
Stage: install
Stage: build
Stage: clean-stale-branches
Stage: deploy-dev
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/components/pb-schema/pb-schema.component.ts
+1
-6
1 addition, 6 deletions
src/app/components/pb-schema/pb-schema.component.ts
src/app/services/prebarrage.service.ts
+14
-0
14 additions, 0 deletions
src/app/services/prebarrage.service.ts
with
15 additions
and
6 deletions
src/app/components/pb-schema/pb-schema.component.ts
+
1
−
6
View file @
68ddb3c3
...
...
@@ -504,6 +504,7 @@ export class PbSchemaComponent implements AfterViewInit, AfterContentInit, OnIni
switch
(
event
.
id
)
{
case
PrebarrageServiceEvents
.
BASIN_WALL_ADDED
:
case
PrebarrageServiceEvents
.
BASIN_WALL_COPIED
:
case
PrebarrageServiceEvents
.
MOVE_BASIN
:
this
.
clearResults
();
this
.
refreshWithSelection
(
nub
.
uid
);
this
.
calculatorComponent
.
showPBInputData
=
true
;
...
...
@@ -562,9 +563,6 @@ export class PbSchemaComponent implements AfterViewInit, AfterContentInit, OnIni
if
(
this
.
_selectedItem
instanceof
PbBassin
)
{
this
.
predamService
.
moveSelectedBasinUp
();
}
this
.
clearResults
();
this
.
refreshWithSelection
(
this
.
_selectedItem
.
uid
);
this
.
calculatorComponent
.
showPBInputData
=
true
;
}
public
get
uitextMoveBasinUp
()
{
...
...
@@ -583,9 +581,6 @@ export class PbSchemaComponent implements AfterViewInit, AfterContentInit, OnIni
if
(
this
.
_selectedItem
instanceof
PbBassin
)
{
this
.
predamService
.
moveSelectedBasinDown
();
}
this
.
clearResults
();
this
.
refreshWithSelection
(
this
.
_selectedItem
.
uid
);
this
.
calculatorComponent
.
showPBInputData
=
true
;
}
public
get
uitextMoveBasinDown
()
{
...
...
This diff is collapsed.
Click to expand it.
src/app/services/prebarrage.service.ts
+
14
−
0
View file @
68ddb3c3
...
...
@@ -5,7 +5,9 @@ export enum PrebarrageServiceEvents {
BASIN_WALL_ADDED
,
// a wall has been added
BASIN_WALL_COPIED
,
// a basin or wall has been copied
BASIN_WALL_REMOVED
,
// a basin or a wall has been removed
MOVE_BASIN
,
// a basin has been moved up or down
}
/**
* service relatif au schéma de prébarrage
*/
...
...
@@ -176,6 +178,12 @@ export class PrebarrageService {
public
moveSelectedBasinUp
()
{
const
uid
=
this
.
_selectedNub
.
uid
;
this
.
moveBasinUp
(
uid
);
this
.
_changeEventEmitter
.
emit
(
{
id
:
PrebarrageServiceEvents
.
MOVE_BASIN
,
data
:
this
.
_selectedNub
}
);
}
/**
...
...
@@ -188,6 +196,12 @@ export class PrebarrageService {
public
moveSelectedBasinDown
()
{
const
uid
=
this
.
_selectedNub
.
uid
;
this
.
moveBasinDown
(
uid
);
this
.
_changeEventEmitter
.
emit
(
{
id
:
PrebarrageServiceEvents
.
MOVE_BASIN
,
data
:
this
.
_selectedNub
}
);
}
/**
...
...
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