Merge pull request #195 from CampusDual/BFS42024-282

Cambiado traductor
CampusDual · Dec 11, 2024 · d17fe6c · d17fe6c
2 parents 04525aa + e886d20
commit d17fe6c
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 40 deletions.
diff --git a/...frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.css b/...frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.css
@@ -3,7 +3,14 @@ font-family: 'Roboto', sans-serif;
 box-sizing: border-box;
 }
 
-
+
+.grid-container{
+height: 93%;}
+.tabPrincipales{
+  height: auto;
+  overflow:hidden;
+  scrollbar-width: 0px;
+}
 .grid-container,
 .table_container {
 width: 96%;
@@ -31,6 +38,7 @@ background-color: #f5f0f2;
 border-radius: 15px;
 padding: 30px;
 gap: 15px;
+
 }
 
 p {
@@ -54,7 +62,7 @@ padding-right: 20px
 
 .fct-container {
 display: grid;
-grid-template-columns: 2fr 1fr;
+grid-template-columns: 2fr;
 grid-template-rows: auto auto;
 width: 96%;
 margin: 5px auto;
@@ -205,7 +213,7 @@ grid-template-columns: 2.5fr 0.5fr;
 .contacto{
   grid-column: 1/2;
   grid-row: 2/3;
-  height: 100%;
+  height: 86.5%;
 
 }
 .contacto fieldset{
@@ -221,6 +229,7 @@ display: grid;
 grid-template-columns: 1fr;
 gap: 20px;
 width: 95%;
+height: auto;
 }
 .datos {
 grid-column: 1 / 2;
@@ -261,7 +270,13 @@ grid-column: 1 / 3;
   grid-column: 2/3;
   grid-row: 1;
 }
+.usuario{
+  margin-top: 0px;
+}
 
+.contacto{
+  height: 100%;
+}
 .fct-container {
   display: flex;
   flex-wrap: wrap;
@@ -275,10 +290,7 @@ grid-column: 1 / 3;
   gap: 20px;
 }
 
-.fct_school,
-.fct_tutor,
-.fct_start,
-.fct_end {
+.fct {
   flex: 1 1 45%;
   min-width: 300px;
 }

diff --git a/...rontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.html b/...rontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.html
@@ -36,17 +36,7 @@
             </div>
           </div>
           <div class="datosPrincipales2">
-            <div class="sepGitUdemy">
-              <div class="githubUser">
-                <label for="LGITHUB_USER">{{'LGITHUB_USER' | oTranslate}}</label>
-                <o-text-input attr="github_user" required="no" max-length="200"></o-text-input>
-              </div>
-              <div class="udemy">
-                <div class="checkbox-container">
-                  <o-checkbox attr="udemy"></o-checkbox>
-                </div>
-              </div>
-            </div>
+
             <div class="dni">
               <label for="LDNI">{{'LDNI' | oTranslate}}</label>
               <o-nif-input attr="dni" label="{{'NIF' | oTranslate}}" read-only="no" required="no"
@@ -79,11 +69,11 @@
           </div>
 
         </fieldset>
-      </div>
+       </div>
         <div class="gridDatos">
           <div class="login">
             <fieldset title="Login">
-              <legend>Login</legend>
+              <legend>{{"Acceso"|oTranslate}}</legend>
               <div class="usuario">
                 <label for="usuario">{{'USER' | oTranslate}}</label>
                 <o-text-input attr="usr_login" [validators]="validatorsWithoutSpace" required="no" id="name"
@@ -98,6 +88,17 @@
                   <o-validator error-name="hasSmallCase" error-text="VALIDATOR.HASSMALLCASE"></o-validator>
                 </o-password-input>
               </div>
+              <div class="sepGitUdemy">
+                <div class="githubUser">
+                  <label for="LGITHUB_USER">{{'LGITHUB_USER' | oTranslate}}</label>
+                  <o-text-input attr="github_user" required="no" max-length="200"></o-text-input>
+                </div>
+                <div class="udemy">
+                  <div class="checkbox-container">
+                    <o-checkbox attr="udemy"></o-checkbox>
+                  </div>
+                </div>
+              </div>
             </fieldset>
           </div>
           <div class="contacto">
@@ -111,7 +112,7 @@
                 <label for="REQ_LEMAIL">{{'REQ_LEMAIL'|oTranslate}}</label>
                 <o-email-input attr="personal_email" max-length="200" required="yes"></o-email-input>
               </div>
-              <div>
+              <div class="correoCampus">
                 <label for="LCAMPUS_EMAIL">{{'LCAMPUS_EMAIL' | oTranslate}}</label>
                 <o-email-input attr="campus_email" max-length="200" required="no"></o-email-input>
               </div>
@@ -218,45 +219,33 @@ <h3>{{ 'Historial_Laboral' | oTranslate }}</h3>
       <div class="fct-container">
         <fieldset title="fct" class="fct-grid">
           <legend>{{"FCT Information"|oTranslate}}</legend>
-          <div>
+          <div class="fct">
             <label for="fct_school">{{'LFCT_SCHOOL' | oTranslate}}</label>
             <o-text-input attr="fct_school" required="no" max-length="100"
               (input)="toUpperCamelCase($event)"></o-text-input>
           </div>
-          <div>
+          <div class="fct">
             <label for="tutor">{{'LTUTOR' | oTranslate}}</label>
             <o-combo attr="tutor" service="tutors" entity="tutor" required="no" searchable="yes" value-column="id"
               columns="id;name;surname1;surname2" visible-columns="name;surname1;surname2" null-selection="true"
               sortable="yes" sort="ASC">
             </o-combo>
           </div>
-          <div>
+          <div class="fct">
             <label for="LFCT_START">{{'LFCT_START' | oTranslate}}</label>
             <o-date-input #startdate attr="fct_start" required="no" format="DD/MM/YYYY"
               (onValueChange)="throwChange(enddate)">
               <o-validator error-name="wrongendate" error-text="END_DATE_MORE_THAN_INIT_DATE"></o-validator>
             </o-date-input>
           </div>
-          <div>
+          <div class="fct">
             <label for="LFCT_END">{{'LFCT_END' | oTranslate}}</label>
             <o-date-input #enddate attr="fct_end" required="no" [validators]="validatorsArray" format="DD/MM/YYYY"
               (onValueChange)="throwChange2(startdate)">
               <o-validator error-name="wrongendate" error-text="END_DATE_MORE_THAN_INIT_DATE"></o-validator>
             </o-date-input>
           </div>
         </fieldset>
-        <fieldset title="User" class="user-grid">
-          <legend>{{'OtherInformation'|oTranslate}}</legend>
-          <div class="githubUser">
-            <label for="LGITHUB_USER">{{'LGITHUB_USER' | oTranslate}}</label>
-            <o-text-input attr="github_user" required="no" max-length="200"></o-text-input>
-          </div>
-          <div class="udemy">
-            <div class="checkbox-container">
-              <o-checkbox attr="udemy"></o-checkbox>
-            </div>
-          </div>
-        </fieldset>
       </div>
     </mat-tab>
     <mat-tab label="{{'LNOTE' | oTranslate}}">
@@ -284,4 +273,4 @@ <h3>{{ 'Historial_Laboral' | oTranslate }}</h3>
   <div *ngIf="showMessage" class="notification">
     <label for="subida">{{ 'subida' | oTranslate }}</label>
   </div>
-</o-form>
+</o-form>
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json
@@ -300,5 +300,6 @@
   "Download" : "Download",
   "Save": "Save",
   "TUTOR_HAS_BOOTCAMPS":"The mentor has assigned bootcamps and cannot be deleted",
-  "nota":"Notes"
+  "nota":"Notes",
+  "Acceso":"Access"
 }
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json
@@ -298,5 +298,6 @@
   "DUPLICATED_USRLOGIN_NAME": "El nombre de usuario ya existe",
   "Download" : "Descargar",
   "Save": "Guardar",
-  "nota":"Notas"
+  "nota":"Notas",
+  "Acceso":"Accesos"
 }