From 0a9f6c88b4994865c6b45ea4d28e71f6c725de72 Mon Sep 17 00:00:00 2001 From: Jesus Blanco Miguez <119857344+eluiui@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:44:45 +0100 Subject: [PATCH] Bfs42024 350 (#291) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Falta quitar lo de estudiante-->notas * tarea 350 falta centrar mensaje * listo el estilo del label de studiantes comentarios * Correción en las traducciones * Falta quitar lo de estudiante-->notas * tarea 350 falta centrar mensaje * listo el estilo del label de studiantes comentarios * Correción en las traducciones * Falta quitar lo de estudiante-->notas * tarea 350 falta centrar mensaje * listo el estilo del label de studiantes comentarios --------- Co-authored-by: David Dominguez Vidal Co-authored-by: eluiui --- .../bootcamp-list.component.html | 10 +- .../config-tables.component.html | 4 +- .../students-detail.component.css | 435 ++++++++++-------- .../students-detail.component.html | 52 ++- .../students-detail.component.ts | 9 +- .../src/main/ngx/src/assets/i18n/en.json | 13 +- .../src/main/ngx/src/assets/i18n/es.json | 5 +- .../src/main/ngx/src/styles.scss | 5 +- 8 files changed, 315 insertions(+), 218 deletions(-) diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-list/bootcamp-list.component.html b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-list/bootcamp-list.component.html index e308f06ac..07bbd47c8 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-list/bootcamp-list.component.html +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-list/bootcamp-list.component.html @@ -21,11 +21,19 @@

{{ 'Bootcamps' | oTranslate }}

page-size-options="10;20;40"> + + + {{ 'Bootcamps' | oTranslate }} > {{ 'LSTUDENTSBOOTCAMPSSTATUS' | oTranslate }} - + diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.css b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.css index 5399a9752..dda700d95 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.css +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.css @@ -1,43 +1,47 @@ * { -font-family: 'Roboto', sans-serif; -box-sizing: border-box; + font-family: 'Roboto', sans-serif; + box-sizing: border-box; } - -.grid-container{ -height: 93%;} -.tabPrincipales{ + +.grid-container { + height: 93%; +} + +.tabPrincipales { height: auto; - overflow:hidden; + overflow: hidden; scrollbar-width: 0px; } + .grid-container, .table_container { -width: 96%; -margin: 5px auto; -background-color: #f5f0f2; -border-radius: 15px; -padding: 30px; -display: grid; -grid-template-columns: 1fr 1fr ; -gap: 15px; -} -.gridDatos{ + width: 96%; + margin: 5px auto; + background-color: #f5f0f2; + border-radius: 15px; + padding: 30px; + display: grid; + grid-template-columns: 1fr 1fr; + gap: 15px; +} + +.gridDatos { grid-column: 2/3; display: grid; grid-column: 1fr; - grid-template-rows:1fr 1fr; + grid-template-rows: 1fr 1fr; gap: 15px; } -.grid-Employment{ -width: 96%; -margin: 5px auto; -background-color: #f5f0f2; -border-radius: 15px; -padding: 30px; -gap: 15px; +.grid-Employment { + width: 96%; + margin: 5px auto; + background-color: #f5f0f2; + border-radius: 15px; + padding: 30px; + gap: 15px; } @@ -48,46 +52,46 @@ p { fieldset { -border-radius: 15px; -padding: 20px; -background-color: #f5f0f2; -border: solid 1px #ccc; -border-radius: 15px; -border: solid 1px; -padding-top: 20px; -padding-left: 20px; -padding-right: 20px + border-radius: 15px; + padding: 20px; + background-color: #f5f0f2; + border: solid 1px #ccc; + border-radius: 15px; + border: solid 1px; + padding-top: 20px; + padding-left: 20px; + padding-right: 20px } .fct-container, .fct-container2 { -display: grid; -grid-template-columns: 2fr; -grid-template-rows: auto auto; -width: 96%; -margin: 5px auto; -background-color: #f5f0f2; -border-radius: 15px; -padding: 20px; -gap: 20px; + display: grid; + grid-template-columns: 2fr; + grid-template-rows: auto auto; + width: 96%; + margin: 5px auto; + background-color: #f5f0f2; + border-radius: 15px; + padding: 20px; + gap: 20px; } .fct-grid { -border-radius: 15px; -grid-column: 1 / 2; -grid-row: 1 / 3; -display: grid; -grid-template-columns: 1fr 1fr; -gap: 60px; -padding: 20px; + border-radius: 15px; + grid-column: 1 / 2; + grid-row: 1 / 3; + display: grid; + grid-template-columns: 1fr 1fr; + gap: 60px; + padding: 20px; } .o-form-toolbar-button { -grid-column: 2/3; -padding-left: 40px; + grid-column: 2/3; + padding-left: 40px; } .sepGitUdemy { @@ -103,24 +107,26 @@ padding-left: 40px; input, select, textarea { -width: 100%; + width: 100%; } -.udemy{ + +.udemy { grid-column: 2/3; width: 20%; padding-top: 22px; } + .datos { -display: grid; -grid-template-columns: 1fr 1fr; -gap: 20px; -grid-column: 1/3; + display: grid; + grid-template-columns: 1fr 1fr; + gap: 20px; + grid-column: 1/3; } .datosPrincipales1 { -grid-column: 1 / 2; -padding: 20px 40px; + grid-column: 1 / 2; + padding: 20px 40px; } @@ -134,71 +140,78 @@ padding: 20px 40px; } .user-grid { -display: grid; -grid-template-columns: 1fr 1fr; -gap: 20px; -padding: 20px; + display: grid; + grid-template-columns: 1fr 1fr; + gap: 20px; + padding: 20px; } .documentsGrid { -gap: 40px; -padding: 30px; -background-color: #1a3459; -border-radius: 5px; -box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); + gap: 40px; + padding: 30px; + background-color: #1a3459; + border-radius: 5px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); } .mat-mdc-tab-group .mdc-tab.mdc-tab--active .mdc-tab__text-label { -color: #7ec117; + color: #7ec117; } + .container_students { -grid-column: 1/2; -background-color: #f5f0f2; -border-radius: 10px; -padding-top: 20px; -padding-left: 20px; -padding-bottom: 20px; -padding-right: 20px; + grid-column: 1/2; + background-color: #f5f0f2; + border-radius: 10px; + padding-top: 20px; + padding-left: 20px; + padding-bottom: 20px; + padding-right: 20px; } + .container_employment { background-color: #f5f0f2; border-radius: 10px; padding-top: 10px; padding-left: 20px; display: flex; - } -.estudiantesDocumentos{ -grid-column: 2/3; -border-radius: 10px; -background-color: #f5f0f2; -padding-top: 20px; -padding-left: 20px; -padding-bottom: 20px; -padding-right: 20px; } -.fieldsetDoc{ -padding: 30px; -border-radius: 5px; -height: 100%; + +.estudiantesDocumentos { + grid-column: 2/3; + border-radius: 10px; + background-color: #f5f0f2; + padding-top: 20px; + padding-left: 20px; + padding-bottom: 20px; + padding-right: 20px; } -.general_table_primera{ -background-color: #f5f0f2; + +.fieldsetDoc { + padding: 30px; + border-radius: 5px; + height: 100%; } -.general_table_segunda{ -background-color: #f5f0f2; +.general_table_primera { + background-color: #f5f0f2; } -.separadorFile{ -display:grid; -grid-template-columns: 2.5fr 0.5fr; +.general_table_segunda { + background-color: #f5f0f2; } -.cont-card{ + +.separadorFile { + display: grid; + grid-template-columns: 2.5fr 0.5fr; +} + +.cont-card { display: flex; flex-direction: row; } + :host { display: flex; flex-direction: column; @@ -206,113 +219,134 @@ grid-template-columns: 2.5fr 0.5fr; height: 100%; overflow: hidden; } -.login fieldset{ + +.login fieldset { height: 100%; } -.contacto{ + +.contacto { grid-column: 1/2; grid-row: 2/3; height: 86.5%; } -.contacto fieldset{ + +.contacto fieldset { height: 100%; width: 100%; } -.usuario{ + +.usuario { margin-top: 30px; } + @media (max-width: 1500px) { -.grid-container { -display: grid; -grid-template-columns: 1fr; -gap: 20px; -width: 95%; -height: auto; -} -.datos { -grid-column: 1 / 2; -} + .grid-container { + display: grid; + grid-template-columns: 1fr; + gap: 20px; + width: 95%; + height: auto; + } -.gridDatos{ - grid-column: 1/2; - grid-template-rows: 1fr -} -.datosPrincipales2 { - grid-column: 2 / 3; - padding: 0; + .datos { + grid-column: 1 / 2; } -.datosPrincipales1{ -grid-column: 1 / 2; -padding: 0; -} -.user-grid { -grid-column: 1 / 2; -} -.fct-container fieldset { -width: 100%; -} -.documentsGrid { -grid-column: 1 / 3; -} -.estudiantesDocumentos { -grid-column: 1 / 3; -} -.o-form-layout-manager{ -grid-column: 1 / 3; -} -.login{ - grid-column: 1/2; -} -.contacto{ - grid-column: 2/3; - grid-row: 1; -} -.usuario{ - margin-top: 0px; -} + .gridDatos { + grid-column: 1/2; + grid-template-rows: 1fr + } -.contacto{ - height: 100%; -} -.fct-container { - display: flex; - flex-wrap: wrap; - gap: 20px; -} + .datosPrincipales2 { + grid-column: 2 / 3; + padding: 0; + } -.fct-grid { - flex: 1 1 100%; - display: flex; - flex-wrap: wrap; - gap: 20px; -} + .datosPrincipales1 { + grid-column: 1 / 2; + padding: 0; + } -.fct { - flex: 1 1 45%; - min-width: 300px; -} + .user-grid { + grid-column: 1 / 2; + } -.notes { - flex: 1 1 100%; -} + .fct-container fieldset { + width: 100%; + } + + .documentsGrid { + grid-column: 1 / 3; + } + + .estudiantesDocumentos { + grid-column: 1 / 3; + } + + .o-form-layout-manager { + grid-column: 1 / 3; + } + + .login { + grid-column: 1/2; + } + + .contacto { + grid-column: 2/3; + grid-row: 1; + } + + .usuario { + margin-top: 0px; + } + + .contacto { + height: 100%; + } + + .fct-container { + display: flex; + flex-wrap: wrap; + gap: 20px; + } + + .fct-grid { + flex: 1 1 100%; + display: flex; + flex-wrap: wrap; + gap: 20px; + } + + .fct { + flex: 1 1 45%; + min-width: 300px; + } + + .notes { + flex: 1 1 100%; + } } .foto { - grid-column: 2 / 3; /* Define la columna */ - grid-row: 0; /* Asegúrate de que esté en la fila 1 */ - justify-self: center; /* Centra horizontalmente */ - align-self: center; /* Centra verticalmente */ + grid-column: 2 / 3; + /* Define la columna */ + grid-row: 0; + /* Asegúrate de que esté en la fila 1 */ + justify-self: center; + /* Centra horizontalmente */ + align-self: center; + /* Centra verticalmente */ margin-bottom: 40px; } -.primera{ + +.primera { grid-column: 1/2; margin: 0%; height: 100%; } -.aviso p{ +.aviso p { color: red; display: flex; align-items: center; @@ -323,7 +357,7 @@ grid-column: 1 / 3; gap: 5px; } -.p_info_foto{ +.p_info_foto { margin-top: 30px; font-size: 12px; color: #1a3459; @@ -333,10 +367,12 @@ grid-column: 1 / 3; margin: 10px; overflow: hidden; } -.fromatotextotitulo{ + +.fromatotextotitulo { font-size: 15px; } -.fromatotexto{ + +.fromatotexto { font-size: 17px; color: black; padding-top: 10px; @@ -377,30 +413,51 @@ div.notification label { justify-content: center; align-items: flex-end; } -.pa2{ + +.pa2 { display: none; } -.boton_eliminar:hover .pa2{ + +.boton_eliminar:hover .pa2 { display: block; } -.boton_eliminar:hover .pa1{ + +.boton_eliminar:hover .pa1 { display: none; } -.cont-bot{ - padding-top: 16px ; + +.cont-bot { + padding-top: 16px; padding-right: 0px; } -.head{ + +.head { padding-left: 10px; } -.botonSalvar{ + +.botonSalvar { display: flex; justify-content: flex-end; } -.cont-card{ + +.cont-card { border: 1px solid #1a3459; border-radius: 15px; -} -.commentsa{ +} + +.commentsa { margin: 10px; -} \ No newline at end of file +} + + +.claseColor { + color: #7ec117; + font-size: 20px; +} +.no-notes-label { + display: flex; + align-items: center; + justify-content: center; + color: #7ec117; + text-size-adjust: 20px; +} diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.html b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.html index acabbaa87..d4e84ee3f 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.html +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.html @@ -267,26 +267,38 @@

{{ 'Historial_Laboral' | oTranslate }}

- - -
- - - - - {{ notas.fecha | date:'dd/MM/yyyy' }} - - -
- - + + + + + +
+ + + + + {{ notas.fecha | date:'dd/MM/yyyy' }} + + +
+ + + + +
+ +
+ + + diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.ts index 2d7ffca28..e14112d2a 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.ts +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.ts @@ -17,6 +17,10 @@ import { OTranslateService } from 'ontimize-web-ngx'; styleUrls: ['./students-detail.component.css'] }) export class StudentsDetailComponent { +notesLoaded(event: any) { + + this.notesBool = event && event.length > 0; +} @ViewChild("idNumber") idNumber: OTextInputComponent; @ViewChild("documentsTable") documentsTable: OTableComponent; @ViewChild("fileinput") fileinput: OFileInputComponent; @@ -35,11 +39,14 @@ export class StudentsDetailComponent { dataArray = spainComunitys.map(comunity => ({ key: comunity, value: comunity })); protected service: OntimizeService; showNotice:boolean=false; + notesBool: boolean = false; // Valor predeterminado (opcional) valueSimple = "Madrid"; // Elige el valor que deseas predeterminar - + onDataLoaded(): boolean { + return this.notesBool; + } constructor( private router: Router, public location: Location, diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json index 6655dc5f0..cef2042f2 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json @@ -256,7 +256,9 @@ "TimeEnd": "End hour", "DayStart": "Start period", "DayEnd": "End period", - "BT_STATUS_TT": "Bootcamp general status", + + + "STU_SEARCH_TT": "Redirect to students detail", "dateRangeBootcamp" : "Start date/End date", "dateRangeBootcampDetail" : "Start date/End date*", @@ -338,7 +340,7 @@ "COMPUTABLE_TRUE":"Computable", "COMPUTABLE_FALSE":"Not computable", "student_bootcamp_status":"Student bootcamp status", - "LSLIDETOGGLE_COMPUTABLE":"Not computable or computable ", + "LSLIDETOGGLE_COMPUTABLE":" Computable or not computable", "STUDENT_HAS_DOCUMENTS":"The student has documents and cannot be deleted", "SelectColor": "Select a color: ", "SelectedColor": "Selected color:", @@ -402,6 +404,11 @@ "ATTR*": "Id Menu*", "VISIBLE": "Visible", "ENABLED": "Enabled", + "NO_NOTES": "No notes avaliable", + "BT_STATUS_TT": "Bootcamp general status", + "STUDENT_TT_BOOTCAMP":"Active students/Total students", "PERMISSIONID*": "Id Rute*", - "LLNOTE":"Last note" + "LLNOTE":"Last note", + "NNOTES":"There are no comments yet..." + } diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json index bc5637d10..d2d0dc4cf 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json @@ -336,7 +336,7 @@ "COMPUTABLE_TRUE":"Computable", "COMPUTABLE_FALSE":"No computable", "student_bootcamp_status":"Estado del estudiante en bootcamp", - "LSLIDETOGGLE_COMPUTABLE":"No computable o computable ", + "LSLIDETOGGLE_COMPUTABLE":" Computable o no computable ", "STUDENT_HAS_DOCUMENTS":"Este estudiante tiene documentos y no puede ser eliminado", "SelectColor": "Selecciona un color: ", "SelectedColor": "Color seleccionado:", @@ -400,6 +400,9 @@ "ATTR*": "Id Menú*", "VISIBLE": "Visible", "ENABLED": "Habilitado", + "STUDENT_TT_BOOTCAMP":"Estudiantes activos/Estudiantes totales", "PERMISSIONID*": "Id Ruta*", + "NNOTES":"Todavía no hay comentarios...", + "NO_NOTES": "No hay notas disponibles", "LLNOTE":"Última nota" } diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/styles.scss b/cd2024bfs4g1-frontend/src/main/ngx/src/styles.scss index e851f79ed..4742261fd 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/styles.scss +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/styles.scss @@ -436,7 +436,10 @@ o-column.o-column .o-container > .o-container-title span{ mat-list-item .mat-mdc-list-item-title { color: #7ec117; font-size: 20px; - --mdc-list-list-item-hover-label-text-color: #7ec117; + visibility: hidden; + --mdc-list-list-item-hover-label-text{ + visibility: hidden; + }; }