Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
RLG Maker
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Romain DELEAU
RLG Maker
Commits
28f18a5b
Commit
28f18a5b
authored
Jun 28, 2023
by
Romain DELEAU
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add background-image to optionnal and repeat tasks
parent
00c822e4
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
7 deletions
+29
-7
optionnal-task.component.scss
...pieces/tasks/optionnal-task/optionnal-task.component.scss
+3
-0
optionnal-task.component.ts
...p/pieces/tasks/optionnal-task/optionnal-task.component.ts
+1
-1
repeat-task.component.html
src/app/pieces/tasks/repeat-task/repeat-task.component.html
+2
-1
repeat-task.component.scss
src/app/pieces/tasks/repeat-task/repeat-task.component.scss
+9
-5
repeat-task.component.ts
src/app/pieces/tasks/repeat-task/repeat-task.component.ts
+14
-0
optionnal.png
src/assets/background-images/optionnal.png
+0
-0
repeatTask.png
src/assets/background-images/repeatTask.png
+0
-0
No files found.
src/app/pieces/tasks/optionnal-task/optionnal-task.component.scss
View file @
28f18a5b
...
...
@@ -245,6 +245,9 @@
resize
:
none
;
flex-grow
:
1
;
font-size
:
15px
;
background-position
:
center
;
background-repeat
:
no-repeat
;
background-size
:
100px
;
}
select
{
...
...
src/app/pieces/tasks/optionnal-task/optionnal-task.component.ts
View file @
28f18a5b
...
...
@@ -23,7 +23,7 @@ export class OptionnalTaskComponent implements OnInit {
@
Input
()
i
!
:
number
;
@
Input
()
j
!
:
number
;
urlIcon
:
string
=
''
;
urlIcon
:
string
=
'
url("../../../../assets/background-images/optionnal.png")
'
;
constructor
(
private
pieceDetailsService
:
PieceDetailsService
)
{
}
...
...
src/app/pieces/tasks/repeat-task/repeat-task.component.html
View file @
28f18a5b
...
...
@@ -11,7 +11,8 @@
<div
class=
"piece-form"
>
<label>
Recommencer
<br>
le tour jusqu'à ce que :
</label>
<textarea
[(
ngModel
)]="
task
.
objective
"
placeholder=
"Faire valider au commanditaire"
></textarea>
<textarea
[(
ngModel
)]="
task
.
objective
"
[(
ngModel
)]="
task
.
objective
"
[
style
.
background-image
]="(
i =
=
findFirstIndexOfTaskType
('
repeat
')[
0
]
&&
j =
=
findFirstIndexOfTaskType
('
repeat
')[
1
])
?
urlIcon
:
''"
placeholder=
"Faire valider au commanditaire"
></textarea>
</div>
<mat-icon
class=
"piece-form-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-repeat"
fontIcon=
"refresh"
*
ngIf=
"task.repeat.iteration > 0 || task.repeat.while != ''"
></mat-icon>
...
...
src/app/pieces/tasks/repeat-task/repeat-task.component.scss
View file @
28f18a5b
...
...
@@ -81,37 +81,41 @@
textarea
{
width
:
80%
;
border
:
none
;
border-radius
:
1
0px
;
border-radius
:
2
0px
;
resize
:
none
;
height
:
50%
;
font-size
:
15px
;
padding
:
10px
;
background-position
:
center
;
background-repeat
:
no-repeat
;
background-size
:
100px
;
}
&
-comment
{
transform
:
scale
(
1
.2
);
position
:
absolute
;
bottom
:
50
px
;
bottom
:
35
px
;
left
:
50px
;
}
&
-repeat
{
transform
:
scale
(
1
.2
);
position
:
absolute
;
bottom
:
50
px
;
bottom
:
35
px
;
left
:
100px
;
}
&
-character
{
transform
:
scale
(
1
.2
);
position
:
absolute
;
bottom
:
50
px
;
bottom
:
35
px
;
left
:
150px
;
}
&
-interrupt
{
transform
:
scale
(
1
.2
);
position
:
absolute
;
bottom
:
50
px
;
bottom
:
35
px
;
left
:
200px
;
}
}
...
...
src/app/pieces/tasks/repeat-task/repeat-task.component.ts
View file @
28f18a5b
...
...
@@ -19,6 +19,9 @@ export class RepeatTaskComponent implements OnInit {
@
Input
()
i
!
:
number
;
@
Input
()
j
!
:
number
;
urlIcon
:
string
=
'url("../../../../assets/background-images/repeatTask.png")'
;
constructor
(
protected
pieceDetailsService
:
PieceDetailsService
)
{
}
ngOnInit
():
void
{
...
...
@@ -53,4 +56,15 @@ export class RepeatTaskComponent implements OnInit {
}
return
res
;
}
findFirstIndexOfTaskType
(
type
:
string
):
number
[]
{
for
(
let
i
=
0
;
i
<
this
.
role
.
tasks
.
length
;
i
++
)
{
for
(
let
j
=
0
;
j
<
this
.
role
.
tasks
[
i
].
length
;
j
++
)
{
if
(
this
.
role
.
tasks
[
i
][
j
]
instanceof
Task
&&
this
.
role
.
tasks
[
i
][
j
]?.
type
==
type
)
{
return
[
i
,
j
];
}
}
}
return
[
0
,
0
];
}
}
src/assets/background-images/optionnal.png
0 → 100644
View file @
28f18a5b
63.9 KB
src/assets/background-images/repeatTask.png
0 → 100644
View file @
28f18a5b
70.4 KB
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