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
13d2dc2c
Commit
13d2dc2c
authored
Jun 28, 2023
by
Romain DELEAU
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
texarea icons in tasks only in the first task of the role
parent
a1f133a0
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
78 additions
and
14 deletions
+78
-14
annexe-task.component.html
src/app/pieces/tasks/annexe-task/annexe-task.component.html
+2
-1
annexe-task.component.scss
src/app/pieces/tasks/annexe-task/annexe-task.component.scss
+1
-2
annexe-task.component.ts
src/app/pieces/tasks/annexe-task/annexe-task.component.ts
+12
-0
final-task.component.html
src/app/pieces/tasks/final-task/final-task.component.html
+2
-1
final-task.component.scss
src/app/pieces/tasks/final-task/final-task.component.scss
+2
-2
final-task.component.ts
src/app/pieces/tasks/final-task/final-task.component.ts
+12
-0
optionnal-task.component.html
...pieces/tasks/optionnal-task/optionnal-task.component.html
+2
-1
optionnal-task.component.scss
...pieces/tasks/optionnal-task/optionnal-task.component.scss
+1
-1
optionnal-task.component.ts
...p/pieces/tasks/optionnal-task/optionnal-task.component.ts
+12
-0
random-event.component.html
...app/pieces/tasks/random-event/random-event.component.html
+2
-1
random-event.component.scss
...app/pieces/tasks/random-event/random-event.component.scss
+1
-2
random-event.component.ts
src/app/pieces/tasks/random-event/random-event.component.ts
+13
-0
task.component.html
src/app/pieces/tasks/task/task.component.html
+2
-1
task.component.scss
src/app/pieces/tasks/task/task.component.scss
+1
-2
task.component.ts
src/app/pieces/tasks/task/task.component.ts
+13
-0
No files found.
src/app/pieces/tasks/annexe-task/annexe-task.component.html
View file @
13d2dc2c
...
@@ -81,7 +81,8 @@
...
@@ -81,7 +81,8 @@
<mat-icon
class=
"piece-form-top-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-top-comment"
fontIcon=
"comment"
*
ngIf=
"task.comments.length > 0"
></mat-icon>
<mat-icon
class=
"piece-form-top-repeat"
fontIcon=
"refresh"
*
ngIf=
"task.repeat.iteration > 0 || task.repeat.while != ''"
></mat-icon>
<mat-icon
class=
"piece-form-top-repeat"
fontIcon=
"refresh"
*
ngIf=
"task.repeat.iteration > 0 || task.repeat.while != ''"
></mat-icon>
</div>
</div>
<textarea
class=
"piece-form-content"
[(
ngModel
)]="
task
.
objective
"
placeholder=
"Vérifier ses connaissances sur les formulaires PHP"
></textarea>
<textarea
class=
"piece-form-content"
[(
ngModel
)]="
task
.
objective
"
[
style
.
background-image
]="(
i =
=
findFirstIndexOfTaskType
('
annexe
')[
0
]
&&
j =
=
findFirstIndexOfTaskType
('
annexe
')[
1
])
?
urlIcon
:
''"
placeholder=
"Vérifier ses connaissances sur les formulaires PHP"
></textarea>
<div
class=
"piece-form-bottom"
>
<div
class=
"piece-form-bottom"
>
<button
mat-button
class=
"piece-form-bottom-prerequires"
(
click
)="
changeDisplayPrerequires
()"
>
<button
mat-button
class=
"piece-form-bottom-prerequires"
(
click
)="
changeDisplayPrerequires
()"
>
Prérequis
Prérequis
...
...
src/app/pieces/tasks/annexe-task/annexe-task.component.scss
View file @
13d2dc2c
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
background-color
:
#f7f7f7
;
background-color
:
#f7f7f7
;
z-index
:
-1
;
z-index
:
-1
;
bottom
:
10px
;
bottom
:
10px
;
left
:
50
px
;
left
:
45
px
;
border
:
solid
black
1px
;
border
:
solid
black
1px
;
border-top-right-radius
:
10px
;
border-top-right-radius
:
10px
;
border-bottom-right-radius
:
10px
;
border-bottom-right-radius
:
10px
;
...
@@ -199,7 +199,6 @@
...
@@ -199,7 +199,6 @@
resize
:
none
;
resize
:
none
;
flex-grow
:
1
;
flex-grow
:
1
;
font-size
:
15px
;
font-size
:
15px
;
background-image
:
url("../../../../assets/background-images/annexe.png")
;
background-position
:
center
;
background-position
:
center
;
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
background-size
:
100px
;
background-size
:
100px
;
...
...
src/app/pieces/tasks/annexe-task/annexe-task.component.ts
View file @
13d2dc2c
...
@@ -23,6 +23,8 @@ export class AnnexeTaskComponent implements OnInit {
...
@@ -23,6 +23,8 @@ export class AnnexeTaskComponent implements OnInit {
@
Input
()
i
!
:
number
;
@
Input
()
i
!
:
number
;
@
Input
()
j
!
:
number
;
@
Input
()
j
!
:
number
;
urlIcon
:
string
=
'url("../../../../assets/background-images/annexe.png")'
;
constructor
(
private
pieceDetailsService
:
PieceDetailsService
)
{
}
constructor
(
private
pieceDetailsService
:
PieceDetailsService
)
{
}
ngOnInit
():
void
{
ngOnInit
():
void
{
...
@@ -111,4 +113,14 @@ export class AnnexeTaskComponent implements OnInit {
...
@@ -111,4 +113,14 @@ export class AnnexeTaskComponent implements OnInit {
return
res
;
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/app/pieces/tasks/final-task/final-task.component.html
View file @
13d2dc2c
...
@@ -112,7 +112,8 @@
...
@@ -112,7 +112,8 @@
<mat-icon
*
ngIf=
"task.symbol.symbol"
[
style
.
color
]="
task
.
symbol
.
color
"
[
fontIcon
]="
task
.
symbol
.
symbol
"
></mat-icon>
<mat-icon
*
ngIf=
"task.symbol.symbol"
[
style
.
color
]="
task
.
symbol
.
color
"
[
fontIcon
]="
task
.
symbol
.
symbol
"
></mat-icon>
</button>
</button>
</div>
</div>
<textarea
class=
"piece-form-content"
[(
ngModel
)]="
task
.
objective
"
placeholder=
"Mettre le site web en ligne"
></textarea>
<textarea
class=
"piece-form-content"
[(
ngModel
)]="
task
.
objective
"
[
style
.
background-image
]="(
i =
=
findFirstIndexOfTaskType
('
final
')[
0
]
&&
j =
=
findFirstIndexOfTaskType
('
final
')[
1
])
?
urlIcon
:
''"
placeholder=
"Mettre le site web en ligne"
></textarea>
<div
class=
"piece-form-bottom"
>
<div
class=
"piece-form-bottom"
>
<button
mat-button
class=
"piece-form-bottom-prerequires"
(
click
)="
changeDisplayPrerequires
()"
>
<button
mat-button
class=
"piece-form-bottom-prerequires"
(
click
)="
changeDisplayPrerequires
()"
>
Prérequis
Prérequis
...
...
src/app/pieces/tasks/final-task/final-task.component.scss
View file @
13d2dc2c
...
@@ -103,7 +103,7 @@
...
@@ -103,7 +103,7 @@
background-color
:
#f7f7f7
;
background-color
:
#f7f7f7
;
z-index
:
-1
;
z-index
:
-1
;
bottom
:
10px
;
bottom
:
10px
;
left
:
50
px
;
left
:
45
px
;
border
:
solid
black
1px
;
border
:
solid
black
1px
;
border-top-right-radius
:
10px
;
border-top-right-radius
:
10px
;
border-bottom-right-radius
:
10px
;
border-bottom-right-radius
:
10px
;
...
@@ -202,6 +202,7 @@
...
@@ -202,6 +202,7 @@
border-right
:
solid
black
1px
;
border-right
:
solid
black
1px
;
width
:
40px
;
width
:
40px
;
height
:
40px
;
height
:
40px
;
background-color
:
var
(
--
background-color
);
transform
:
translateY
(
-50%
)
rotate
(
45deg
);
transform
:
translateY
(
-50%
)
rotate
(
45deg
);
position
:
absolute
;
position
:
absolute
;
left
:
-20px
;
left
:
-20px
;
...
@@ -233,7 +234,6 @@
...
@@ -233,7 +234,6 @@
resize
:
none
;
resize
:
none
;
flex-grow
:
1
;
flex-grow
:
1
;
font-size
:
15px
;
font-size
:
15px
;
background-image
:
url("../../../../assets/background-images/final.png")
;
background-position
:
center
;
background-position
:
center
;
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
background-size
:
100px
;
background-size
:
100px
;
...
...
src/app/pieces/tasks/final-task/final-task.component.ts
View file @
13d2dc2c
...
@@ -23,6 +23,8 @@ export class FinalTaskComponent implements OnInit {
...
@@ -23,6 +23,8 @@ export class FinalTaskComponent implements OnInit {
@
Input
()
i
!
:
number
;
@
Input
()
i
!
:
number
;
@
Input
()
j
!
:
number
;
@
Input
()
j
!
:
number
;
urlIcon
:
string
=
'url("../../../../assets/background-images/final.png")'
;
constructor
(
private
pieceDetailsService
:
PieceDetailsService
)
{
}
constructor
(
private
pieceDetailsService
:
PieceDetailsService
)
{
}
ngOnInit
():
void
{
ngOnInit
():
void
{
...
@@ -113,4 +115,14 @@ export class FinalTaskComponent implements OnInit {
...
@@ -113,4 +115,14 @@ export class FinalTaskComponent implements OnInit {
return
res
;
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/app/pieces/tasks/optionnal-task/optionnal-task.component.html
View file @
13d2dc2c
...
@@ -113,7 +113,8 @@
...
@@ -113,7 +113,8 @@
<mat-icon
*
ngIf=
"task.symbol.symbol"
[
style
.
color
]="
task
.
symbol
.
color
"
[
fontIcon
]="
task
.
symbol
.
symbol
"
></mat-icon>
<mat-icon
*
ngIf=
"task.symbol.symbol"
[
style
.
color
]="
task
.
symbol
.
color
"
[
fontIcon
]="
task
.
symbol
.
symbol
"
></mat-icon>
</button>
</button>
</div>
</div>
<textarea
class=
"piece-form-content"
[(
ngModel
)]="
task
.
objective
"
placeholder=
"Partir d'un template / Partir de zéro"
></textarea>
<textarea
class=
"piece-form-content"
[(
ngModel
)]="
task
.
objective
"
[
style
.
background-image
]="(
i =
=
findFirstIndexOfTaskType
('
optionnal
')[
0
]
&&
j =
=
findFirstIndexOfTaskType
('
optionnal
')[
1
])
?
urlIcon
:
''"
placeholder=
"Partir d'un template / Partir de zéro"
></textarea>
<div
class=
"piece-form-bottom"
>
<div
class=
"piece-form-bottom"
>
<button
mat-button
class=
"piece-form-bottom-prerequires"
(
click
)="
changeDisplayPrerequires
()"
>
<button
mat-button
class=
"piece-form-bottom-prerequires"
(
click
)="
changeDisplayPrerequires
()"
>
Prérequis
Prérequis
...
...
src/app/pieces/tasks/optionnal-task/optionnal-task.component.scss
View file @
13d2dc2c
...
@@ -103,7 +103,7 @@
...
@@ -103,7 +103,7 @@
background-color
:
#f7f7f7
;
background-color
:
#f7f7f7
;
z-index
:
-1
;
z-index
:
-1
;
bottom
:
10px
;
bottom
:
10px
;
left
:
50
px
;
left
:
45
px
;
border
:
solid
black
1px
;
border
:
solid
black
1px
;
border-top-right-radius
:
10px
;
border-top-right-radius
:
10px
;
border-bottom-right-radius
:
10px
;
border-bottom-right-radius
:
10px
;
...
...
src/app/pieces/tasks/optionnal-task/optionnal-task.component.ts
View file @
13d2dc2c
...
@@ -23,6 +23,8 @@ export class OptionnalTaskComponent implements OnInit {
...
@@ -23,6 +23,8 @@ export class OptionnalTaskComponent implements OnInit {
@
Input
()
i
!
:
number
;
@
Input
()
i
!
:
number
;
@
Input
()
j
!
:
number
;
@
Input
()
j
!
:
number
;
urlIcon
:
string
=
''
;
constructor
(
private
pieceDetailsService
:
PieceDetailsService
)
{
}
constructor
(
private
pieceDetailsService
:
PieceDetailsService
)
{
}
ngOnInit
():
void
{
ngOnInit
():
void
{
...
@@ -131,4 +133,14 @@ export class OptionnalTaskComponent implements OnInit {
...
@@ -131,4 +133,14 @@ export class OptionnalTaskComponent implements OnInit {
return
res
;
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/app/pieces/tasks/random-event/random-event.component.html
View file @
13d2dc2c
...
@@ -105,7 +105,8 @@
...
@@ -105,7 +105,8 @@
<mat-icon
*
ngIf=
"task.symbol.symbol"
[
style
.
color
]="
task
.
symbol
.
color
"
[
fontIcon
]="
task
.
symbol
.
symbol
"
></mat-icon>
<mat-icon
*
ngIf=
"task.symbol.symbol"
[
style
.
color
]="
task
.
symbol
.
color
"
[
fontIcon
]="
task
.
symbol
.
symbol
"
></mat-icon>
</button>
</button>
</div>
</div>
<textarea
class=
"piece-form-content"
[(
ngModel
)]="
task
.
objective
"
placeholder=
"Le client modifie sa demande"
></textarea>
<textarea
class=
"piece-form-content"
[(
ngModel
)]="
task
.
objective
"
[
style
.
background-image
]="(
i =
=
findFirstIndexOfTaskType
('
event
')[
0
]
&&
j =
=
findFirstIndexOfTaskType
('
event
')[
1
])
?
urlIcon
:
''"
placeholder=
"Le client modifie sa demande"
></textarea>
<div
class=
"piece-form-bottom"
>
<div
class=
"piece-form-bottom"
>
<button
mat-button
class=
"piece-form-bottom-prerequires"
(
click
)="
changeDisplayPrerequires
()"
>
<button
mat-button
class=
"piece-form-bottom-prerequires"
(
click
)="
changeDisplayPrerequires
()"
>
Prérequis
Prérequis
...
...
src/app/pieces/tasks/random-event/random-event.component.scss
View file @
13d2dc2c
...
@@ -94,7 +94,7 @@
...
@@ -94,7 +94,7 @@
background-color
:
#f7f7f7
;
background-color
:
#f7f7f7
;
z-index
:
-1
;
z-index
:
-1
;
bottom
:
10px
;
bottom
:
10px
;
left
:
50
px
;
left
:
45
px
;
border
:
solid
black
1px
;
border
:
solid
black
1px
;
border-top-right-radius
:
10px
;
border-top-right-radius
:
10px
;
border-bottom-right-radius
:
10px
;
border-bottom-right-radius
:
10px
;
...
@@ -236,7 +236,6 @@
...
@@ -236,7 +236,6 @@
resize
:
none
;
resize
:
none
;
flex-grow
:
1
;
flex-grow
:
1
;
font-size
:
15px
;
font-size
:
15px
;
background-image
:
url("../../../../assets/background-images/event.png")
;
background-position
:
center
;
background-position
:
center
;
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
background-size
:
100px
;
background-size
:
100px
;
...
...
src/app/pieces/tasks/random-event/random-event.component.ts
View file @
13d2dc2c
...
@@ -23,6 +23,8 @@ export class RandomEventComponent implements OnInit {
...
@@ -23,6 +23,8 @@ export class RandomEventComponent implements OnInit {
@
Input
()
i
!
:
number
;
@
Input
()
i
!
:
number
;
@
Input
()
j
!
:
number
;
@
Input
()
j
!
:
number
;
urlIcon
:
string
=
'url("../../../../assets/background-images/event.png")'
;
constructor
(
protected
pieceDetailsService
:
PieceDetailsService
)
{
}
constructor
(
protected
pieceDetailsService
:
PieceDetailsService
)
{
}
ngOnInit
():
void
{
ngOnInit
():
void
{
...
@@ -107,4 +109,15 @@ export class RandomEventComponent implements OnInit {
...
@@ -107,4 +109,15 @@ export class RandomEventComponent implements OnInit {
}
}
return
res
;
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/app/pieces/tasks/task/task.component.html
View file @
13d2dc2c
...
@@ -113,7 +113,8 @@
...
@@ -113,7 +113,8 @@
<mat-icon
*
ngIf=
"task.symbol.symbol"
[
style
.
color
]="
task
.
symbol
.
color
"
[
fontIcon
]="
task
.
symbol
.
symbol
"
></mat-icon>
<mat-icon
*
ngIf=
"task.symbol.symbol"
[
style
.
color
]="
task
.
symbol
.
color
"
[
fontIcon
]="
task
.
symbol
.
symbol
"
></mat-icon>
</button>
</button>
</div>
</div>
<textarea
class=
"piece-form-content"
[(
ngModel
)]="
task
.
objective
"
placeholder=
"Positionner dans l'ordre les balises HTML principales"
></textarea>
<textarea
class=
"piece-form-content"
[(
ngModel
)]="
task
.
objective
"
[
style
.
background-image
]="(
i =
=
findFirstIndexOfTaskType
('
normal
')[
0
]
&&
j =
=
findFirstIndexOfTaskType
('
normal
')[
1
])
?
urlIcon
:
''"
placeholder=
"Positionner dans l'ordre les balises HTML principales"
></textarea>
<div
class=
"piece-form-bottom"
>
<div
class=
"piece-form-bottom"
>
<button
mat-button
class=
"piece-form-bottom-prerequires"
(
click
)="
changeDisplayPrerequires
()"
>
<button
mat-button
class=
"piece-form-bottom-prerequires"
(
click
)="
changeDisplayPrerequires
()"
>
Prérequis
Prérequis
...
...
src/app/pieces/tasks/task/task.component.scss
View file @
13d2dc2c
...
@@ -103,7 +103,7 @@
...
@@ -103,7 +103,7 @@
background-color
:
#f7f7f7
;
background-color
:
#f7f7f7
;
z-index
:
-1
;
z-index
:
-1
;
bottom
:
10px
;
bottom
:
10px
;
left
:
50
px
;
left
:
45
px
;
border
:
solid
black
1px
;
border
:
solid
black
1px
;
border-top-right-radius
:
10px
;
border-top-right-radius
:
10px
;
border-bottom-right-radius
:
10px
;
border-bottom-right-radius
:
10px
;
...
@@ -245,7 +245,6 @@
...
@@ -245,7 +245,6 @@
resize
:
none
;
resize
:
none
;
flex-grow
:
1
;
flex-grow
:
1
;
font-size
:
15px
;
font-size
:
15px
;
background-image
:
url("../../../../assets/background-images/tache.png")
;
background-position
:
center
;
background-position
:
center
;
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
background-size
:
100px
;
background-size
:
100px
;
...
...
src/app/pieces/tasks/task/task.component.ts
View file @
13d2dc2c
...
@@ -23,6 +23,8 @@ export class TaskComponent implements OnInit {
...
@@ -23,6 +23,8 @@ export class TaskComponent implements OnInit {
@
Input
()
i
!
:
number
;
@
Input
()
i
!
:
number
;
@
Input
()
j
!
:
number
;
@
Input
()
j
!
:
number
;
urlIcon
:
string
=
'url("../../../../assets/background-images/tache.png")'
;
constructor
(
protected
pieceDetailsService
:
PieceDetailsService
)
{
}
constructor
(
protected
pieceDetailsService
:
PieceDetailsService
)
{
}
ngOnInit
():
void
{
ngOnInit
():
void
{
...
@@ -130,6 +132,17 @@ export class TaskComponent implements OnInit {
...
@@ -130,6 +132,17 @@ export class TaskComponent implements OnInit {
}
}
return
res
;
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
];
}
}
}
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