Merge pull request #185 from CampusDual/develop

Bug fixes 3
CampusDual · Dec 9, 2024 · 719190b · 719190b
2 parents 91d7d77 + 5159c85
commit 719190b
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 8 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
@@ -1,6 +1,6 @@
-<o-form #form attr="bootcampsDetail" service="bootcamps" entity="bootcamp" keys="id"
+<o-form #bootcampDetailForm attr="bootcampsDetail" service="bootcamps" entity="bootcamp" keys="id"
   header-actions="R;U;D" (onUpdate)="volver($event)" (onDelete)="volver($event)" show-header-navigation="no"
-  confirm-exit="false" (onDataLoaded)="inicialDR()">
+  confirm-exit="false" (onDataLoaded)="onBootcampChange($event);inicialDR()">
   <o-text-input #idNumber attr="id" sql-type="INTEGER" enabled="no" hidden="true"></o-text-input>
 
   <div class="grid-container">

diff --git a/...tend/src/main/ngx/src/app/main/data/personal-tutor-info/personal-tutor-info.component.css b/...tend/src/main/ngx/src/app/main/data/personal-tutor-info/personal-tutor-info.component.css
@@ -131,3 +131,8 @@ fieldset {
   justify-content: center;
 
 }
+
+
+.pmydata.empty {
+  padding-top: 20px;
+}
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
@@ -24,9 +24,14 @@
                         <label for="surname1">{{'DSURNAME1'|oTranslate}}</label>
                         <p class="pmydata">{{form.getDataValue('surname1').value}}</p>
                     </div>
-                    <div class="apellido2" class="padding">
-                        <label for="surname2">{{'LSURNAME2' | oTranslate}}</label>
-                        <p class="pmydata">{{form.getDataValue('surname2').value}}</p>
+                    <div class="apellido2 padding">
+                        <label for="surname2">{{ 'LSURNAME2' | oTranslate }}</label>
+                        <p class="pmydata" *ngIf="form.getDataValue('surname2').value; else emptySurname"> 
+                            {{ form.getDataValue('surname2').value }}
+                        </p>
+                        <ng-template #emptySurname>
+                            <p class="pmydata empty">{{ ' ' }}</p>
+                        </ng-template>
                     </div>
                     <div class="email" class="padding">
                         <label for="LEMAIL">{{'DEMAIL'|oTranslate}}</label>

diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/tutors/tutors-new/tutors-new.component.html b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/tutors/tutors-new/tutors-new.component.html
@@ -1,5 +1,5 @@
 <o-form #tutorsform attr="tutorsNew" service="tutors" entity="tutor" header-actions="R;I;U;D"
-  show-header-navigation="no" after-insert-mode="new" confirm-exit="no">
+(onInsert)="volver($event)" show-header-navigation="no" confirm-exit="no">
 
   <div class="grid-container">
     <fieldset class="datos">

diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/tutors/tutors-new/tutors-new.component.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/tutors/tutors-new/tutors-new.component.ts
@@ -1,4 +1,5 @@
 import { Component, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
 import { ValidatorFn } from '@angular/forms';
 import { DialogService, OImageComponent, OValidators } from 'ontimize-web-ngx';
 
@@ -15,13 +16,17 @@ export class TutorsNewComponent {
   @ViewChild("UsrPhoto") UsrPhoto: OImageComponent;
   validatorsNewPasswordArray: ValidatorFn[] = [];
 
-  constructor(protected dialogService: DialogService) {
+  constructor(protected dialogService: DialogService, private router: Router) {
     this.validatorsNewPasswordArray.push(OValidators.patternValidator(/\d/, 'hasNumber'));
     this.validatorsNewPasswordArray.push(OValidators.patternValidator(/[A-Z]/, 'hasCapitalCase'));
     this.validatorsNewPasswordArray.push(OValidators.patternValidator(/[a-z]/, 'hasSmallCase'));
     this.validatorsWithoutSpace.push(OValidators.patternValidator(/^(?!\s*$).+/, 'hasSpecialCharacters'));
   }
 
+  volver(e) {
+    this.router.navigate(['./main/tutors']);
+  }
+
   toUpperCamelCase(event: any) {
     event.target.value = event.target.value
       .split(' ')

diff --git a/...__create_view_students_with_bootcamps.sql → ...__create_view_students_with_bootcamps.sql b/...__create_view_students_with_bootcamps.sql → ...__create_view_students_with_bootcamps.sql
@@ -1,3 +1,13 @@
+drop view public.v_recent_employment_status;
+
+CREATE OR REPLACE VIEW public.v_recent_employment_status
+AS SELECT DISTINCT ON (esh.student_id) esh.student_id,
+    esh.employment_status_id AS v_employment_status_id,
+    es.situation AS employment_status
+   FROM employment_status_history esh
+     JOIN employment_status es ON esh.employment_status_id = es.id
+  ORDER BY esh.student_id, esh.status_date_change DESC;
+
 create or replace view v_students_with_bootcamps as
 SELECT
 st.*,uu.*,ss.status,vres.employment_status,vres.v_employment_status_id,concat(concat('|',string_agg(sb.bootcamp_id::text,'|')),'|') bootcamps_id

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: dev014c379
+  version: dev7996332
 imagePullSecrets: 
   - name: "github-ecr-cred" 
 nameOverride: ""