Merge pull request #307 from CampusDual/develop

THE END
CampusDual · Jan 24, 2025 · 1262755 · 1262755
2 parents 8ca2e25 + 210b9c8
commit 1262755
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/...tend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html b/...tend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html
@@ -268,7 +268,7 @@ <h3>{{ 'BootcampDoc' | oTranslate }}</h3>
                 </o-table-column>
                 <o-table-column class="center" attr="session_name" title="session_name"></o-table-column>
                 <o-table-column class="center" attr="password" title="password"></o-table-column>
-                <o-table-column class="center" attr="status" title="status_session"
+                <o-table-column class="center" attr="status" title="sessionstatus"
                 type="string" content-align="center" title-align="center"
                 ><o-table-cell-renderer-translate></o-table-cell-renderer-translate>
                 </o-table-column>

diff --git a/.../app/main/data/personal-info/personal-info-sessions/personal-info-sessions.component.html b/.../app/main/data/personal-info/personal-info-sessions/personal-info-sessions.component.html
@@ -44,7 +44,7 @@
         </o-table-column>
         <o-table-column class="center" attr="session_name" title="session_name"></o-table-column>
         <o-table-column class="center" attr="password" title="password"></o-table-column>
-        <o-table-column class="center" attr="status" title="status" type="string" content-align="center"
+        <o-table-column class="center" attr="status" title="sessionstatus" type="string" content-align="center"
           title-align="center"><o-table-cell-renderer-translate></o-table-cell-renderer-translate>
 
           <o-table-paginator page-size="10" page-size-options="10;20;40"></o-table-paginator>

diff --git a/...bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-info/personal-info.component.html b/...bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-info/personal-info.component.html
@@ -106,7 +106,7 @@
             <o-table class="general_table" attr="studentBootcampsTable" service="studentBootcamps"
               entity="studentsWithBootcamp" keys="id" parent-keys="student_id:id"
               columns="id;bootcamp_id;bootcampname" visible-columns="bootcampname;Detalle"
-              default-visible-columns="bootcampname;status;Detalle" detail-mode="false"
+              default-visible-columns="bootcampname;Detalle" detail-mode="false"
               delete-button="false" show-report-on-demand-option="false" insert-button="false"
               show-charts-on-demand-option="false" refresh-button="false">
               <o-table-paginator page-size="20" page-size-options="10;20;40"></o-table-paginator>

diff --git a/...n/data/personal-tutor-info/bootcamp-students-table/bootcamp-students-table.component.html b/...n/data/personal-tutor-info/bootcamp-students-table/bootcamp-students-table.component.html
@@ -11,9 +11,9 @@
       <legend>{{'STUDENTS_IN_BOOTCAMP'| oTranslate}}</legend>
       <o-table class="general_table" virtual-scroll="false" attr="studentsBootcampTable" service="studentBootcamps"
         entity="studentsWithBootcamp" keys="id" parent-keys="bootcamp_id:id"
-        columns="bootcamp_id;id;name;surname1;surname2;personal_email;student_id;status;sb_start_date;sb_end_date"
-        visible-columns="name;surname1;surname2;personal_email;status;sb_start_date;sb_end_date"
-        default-visible-columns="name;surname1;personal_email;status" query-rows="10"
+        columns="bootcamp_id;id;name;surname1;surname2;personal_email;student_id;sb_start_date;sb_end_date;student_bootcamp_status"
+        visible-columns="name;surname1;surname2;personal_email;sb_start_date;sb_end_date;student_bootcamp_status"
+        default-visible-columns="name;surname1;personal_email;student_bootcamp_status" query-rows="10"
         show-report-on-demand-option="false" show-charts-on-demand-option="false" detail-mode="false" query-on-init="true" pageable="true"
         insert-button="false" delete-button="false" refresh-button="false" selection-mode="none" virtual-scroll="true">
         <o-table-column attr="sb_start_date" title="start_date" type="date" format="DD/MM/YYYY"></o-table-column>
@@ -85,7 +85,7 @@
             </o-table-column>
             <o-table-column class="center" attr="session_name" title="session_name"></o-table-column>
             <o-table-column class="center" attr="password" title="password"></o-table-column>
-            <o-table-column class="center" attr="status" title="status"
+            <o-table-column class="center" attr="status" title="sessionstatus"
             type="string" content-align="center" title-align="center"
             ><o-table-cell-renderer-translate></o-table-cell-renderer-translate>
 

diff --git a/...end/src/main/ngx/src/app/main/data/personal-tutor-info/personal-tutor-info.component.html b/...end/src/main/ngx/src/app/main/data/personal-tutor-info/personal-tutor-info.component.html
@@ -52,9 +52,8 @@
                         <o-table-context-menu view-detail="false" edit="false" delete="false"
                             insert="false"></o-table-context-menu>
                         <o-table-column attr="bootcampname" title="Bootcamp name"></o-table-column>
-                        <o-table-column attr="status" title="status" type="string" content-align="center"
-                            title-align="center" tooltip="yes"
-                            tooltip-value="{{'BT_STATUS_TT'|oTranslate}}"><o-table-cell-renderer-translate></o-table-cell-renderer-translate>
+                        <o-table-column attr="status" title="BT_STATUS_TT" type="string" content-align="center"
+                            title-align="center" tooltip="yes" ><o-table-cell-renderer-translate></o-table-cell-renderer-translate>
                         </o-table-column>
 
                     </o-table>

diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json
@@ -415,5 +415,6 @@
   "NNOTES":"There are no comments yet...",
   "creation_date": "Creation date",
   "comercial_status":"Student bootcamp status",
+  "sessionstatus":"Session status",
   "Do_you_really_want_to_delete_student_bootcamp":"Are you sure you want to delete it? Assistance related to this student in the bootcamp will be eliminated."
 }
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json
@@ -413,5 +413,6 @@
   "MISSING CODE":"Código faltante",
   "creation_date": "Fecha de alta",
   "comercial_status":"Estado del alumno en Bootcamp",
-  "Do_you_really_want_to_delete_student_bootcamp":"Seguro que quieres borrarlo? Se eliminarán las asistencias relacionadas a este estudiante en el bootcamp."
+  "Do_you_really_want_to_delete_student_bootcamp":"Seguro que quieres borrarlo? Se eliminarán las asistencias relacionadas a este estudiante en el bootcamp.",
+  "sessionstatus":"Estado de sesión"
 }
diff --git a/charts/cd2024bfs4g1/values-dev.yaml b/charts/cd2024bfs4g1/values-dev.yaml
@@ -6,7 +6,7 @@ image:
   pullPolicy: IfNotPresent
   ## provided as basic setup. replace as needed
   repository: ghcr.io/campusdual/cd2024bfs4g1
-  version: dev5cf465d
+  version: dev9539d3f
 imagePullSecrets: 
   - name: "github-ecr-cred" 
 nameOverride: ""