Skip to content

Commit 08bca52

Browse files
authored
Merge pull request #38 from CodeURJC-DAW-2021-22/develop
Develop to main
2 parents 4decbe2 + 27504ef commit 08bca52

File tree

4 files changed

+10
-22
lines changed

4 files changed

+10
-22
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ El segundo se encarga de crear la imagen docker a partir del Dockerfile, subirla
354354

355355
## Diagrama de clases y templates
356356

357-
![](ScreenshotsFase3/diagramaClasesTemplatesWallypopModificado.png)
357+
![](ScreenshotsFase3/diagramaClasesTemplatesModificado.jpg)
358358

359359
## Contribución miembros equipo
360360

752 KB
Loading
-93.6 KB
Binary file not shown.

backend/src/main/resources/templates/graphic.html

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1+
12
<!-- ====== Contenido de pagina ======-->
23
<section class="full-width">
34
<div class="container">
45
<div class="row">
5-
<center>
6-
<div id="container" style="width: 700px; height: 400px "></div>
7-
</center>
6+
<center><div id="container" style="width: 700px; height: 400px "></div></center>
87
</div>
98
</div>
109
</section>
@@ -91,27 +90,16 @@
9190
name: 'Brands',
9291
colorByPoint: true,
9392
data: [
94-
{{#Categories}
95-
}
93+
{{#Categories}}
9694
{
9795
name: '{{TITLE}}',
98-
y: {{size}
99-
},
100-
sliced
101-
:
102-
true,
103-
selected
104-
:
105-
true
96+
y: {{size}},
97+
sliced: true,
98+
selected: true
10699
},
107-
{
108-
{
109-
/Categories}}
110-
]
111-
}
100+
{{/Categories}}
112101
]
113-
}
114-
)
115-
;
102+
}]
103+
});
116104
</script>
117105

0 commit comments

Comments
 (0)