From 8ded2965d94d4d47a4c6071eb93295384ee948cc Mon Sep 17 00:00:00 2001 From: Velasco Date: Mon, 14 Oct 2024 14:23:13 +0200 Subject: [PATCH 1/8] First commit --- .../cd2024bfs4g1/model/core/service/StudentBootcampDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java index 762d0c9ed..1a01d8368 100644 --- a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java +++ b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java @@ -30,6 +30,6 @@ public EntityResult studentBootcampInsert(Map attrMap) throws On public EntityResult studentBootcampUpdate(Map attrMap, Map keyMap) throws OntimizeJEERuntimeException{ return this.daoHelper.update(this.studentDao, attrMap, keyMap); }; - +// } From 945595fd9986783ad71f60749af7702c196bfa50 Mon Sep 17 00:00:00 2001 From: Velasco Date: Mon, 14 Oct 2024 14:26:35 +0200 Subject: [PATCH 2/8] Second commit --- .../cd2024bfs4g1/model/core/service/StudentBootcampDao.java | 1 - 1 file changed, 1 deletion(-) diff --git a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java index 1a01d8368..7af485a40 100644 --- a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java +++ b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java @@ -30,6 +30,5 @@ public EntityResult studentBootcampInsert(Map attrMap) throws On public EntityResult studentBootcampUpdate(Map attrMap, Map keyMap) throws OntimizeJEERuntimeException{ return this.daoHelper.update(this.studentDao, attrMap, keyMap); }; -// } From eb51b22b88f8545b4523968a3d56d8ed249fe386 Mon Sep 17 00:00:00 2001 From: Velasco Date: Mon, 14 Oct 2024 14:54:41 +0200 Subject: [PATCH 3/8] Added delete functionality to backend --- .../api/core/service/IStudentBootcampService.java | 2 +- .../bootcamp-details/bootcamp-details.component.html | 8 ++++++++ .../bootcamp-details/bootcamp-details.component.ts | 9 ++++++++- .../model/core/service/StudentBootcampDao.java | 6 +++--- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/cd2024bfs4g1-api/src/main/java/com/campusdual/cd2024bfs4g1/api/core/service/IStudentBootcampService.java b/cd2024bfs4g1-api/src/main/java/com/campusdual/cd2024bfs4g1/api/core/service/IStudentBootcampService.java index 4eb3e9cf7..9da0ffbd8 100644 --- a/cd2024bfs4g1-api/src/main/java/com/campusdual/cd2024bfs4g1/api/core/service/IStudentBootcampService.java +++ b/cd2024bfs4g1-api/src/main/java/com/campusdual/cd2024bfs4g1/api/core/service/IStudentBootcampService.java @@ -11,5 +11,5 @@ public interface IStudentBootcampService { EntityResult studentBootcampInsert(Map attrMap) throws OntimizeJEERuntimeException; - EntityResult studentBootcampUpdate(Map attrMap, Map keyMap) throws OntimizeJEERuntimeException; + EntityResult studentBootcampDelete(Map keyMap) throws OntimizeJEERuntimeException; } \ No newline at end of file diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html index b25eb653d..91cec3df3 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html @@ -1,3 +1,11 @@ + + + + + + + + diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts index 69b669573..f92fdd5a3 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts @@ -6,5 +6,12 @@ import { Component } from '@angular/core'; styleUrls: ['./bootcamp-details.component.css'] }) export class BootcampDetailsComponent { - + addStudent() { + //TODO: query + console.log("asdf") + } + deleteStudent(){ + //TODO: query + console.log("aaaaa") + } } diff --git a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java index 7af485a40..3bff7426f 100644 --- a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java +++ b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java @@ -27,8 +27,8 @@ public EntityResult studentBootcampInsert(Map attrMap) throws On } @Override - public EntityResult studentBootcampUpdate(Map attrMap, Map keyMap) throws OntimizeJEERuntimeException{ - return this.daoHelper.update(this.studentDao, attrMap, keyMap); - }; + public EntityResult studentBootcampDelete(Map keyMap) throws OntimizeJEERuntimeException { + return this.daoHelper.delete(this.studentDao, keyMap); + } } From cd3eead05cad1538b071843b28d2e6e9d857e309 Mon Sep 17 00:00:00 2001 From: Velasco Date: Tue, 15 Oct 2024 10:41:07 +0200 Subject: [PATCH 4/8] Bug fixing --- .../bootcamp-details.component.html | 23 ++++++++----------- .../bootcamps/bootcamps-routing.module.ts | 5 +++- ...mpDao.java => StudentBootcampService.java} | 10 ++++---- .../main/resources/dao/StudentBootcampDao.xml | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-) rename cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/{StudentBootcampDao.java => StudentBootcampService.java} (72%) diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html index 91cec3df3..bc0cf032d 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html @@ -1,14 +1,9 @@ - - - - - - - - - - - - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamps-routing.module.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamps-routing.module.ts index 29388f62f..f3b2c3c30 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamps-routing.module.ts +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamps-routing.module.ts @@ -5,7 +5,10 @@ import { BootcampListComponent } from './bootcamp-list/bootcamp-list.component'; const routes: Routes = [ //AQUI ES DONDE REDIRIGIMOS A LA LISTA SI ESTA VACIA {path:"",redirectTo:"list",pathMatch:"full"}, - {path:"list",component:BootcampListComponent}]; + {path:"list",component:BootcampListComponent}, + {path:'list/:id', component: BootcampDetailsComponent}, + {path:'list/:id/new', component: BootcampDetailsComponent} +]; @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampService.java similarity index 72% rename from cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java rename to cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampService.java index 3bff7426f..279c1ff6a 100644 --- a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampDao.java +++ b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampService.java @@ -1,7 +1,7 @@ package com.campusdual.cd2024bfs4g1.model.core.service; import com.campusdual.cd2024bfs4g1.api.core.service.IStudentBootcampService; -import com.campusdual.cd2024bfs4g1.model.core.dao.StudentDao; +import com.campusdual.cd2024bfs4g1.model.core.dao.StudentBootcampDao; import com.ontimize.jee.common.dto.EntityResult; import com.ontimize.jee.common.exceptions.OntimizeJEERuntimeException; import com.ontimize.jee.server.dao.DefaultOntimizeDaoHelper; @@ -13,22 +13,22 @@ @Service("StudentBootcampService") @Lazy -public class StudentBootcampDao implements IStudentBootcampService { +public class StudentBootcampService implements IStudentBootcampService { @Autowired - private StudentDao studentDao; + private StudentBootcampDao studentBootcampDao; @Autowired private DefaultOntimizeDaoHelper daoHelper; @Override public EntityResult studentBootcampInsert(Map attrMap) throws OntimizeJEERuntimeException { - return this.daoHelper.insert(this.studentDao, attrMap); + return this.daoHelper.insert(this.studentBootcampDao, attrMap); } @Override public EntityResult studentBootcampDelete(Map keyMap) throws OntimizeJEERuntimeException { - return this.daoHelper.delete(this.studentDao, keyMap); + return this.daoHelper.delete(this.studentBootcampDao, keyMap); } } diff --git a/cd2024bfs4g1-model/src/main/resources/dao/StudentBootcampDao.xml b/cd2024bfs4g1-model/src/main/resources/dao/StudentBootcampDao.xml index 0007dbbb8..ab178b756 100644 --- a/cd2024bfs4g1-model/src/main/resources/dao/StudentBootcampDao.xml +++ b/cd2024bfs4g1-model/src/main/resources/dao/StudentBootcampDao.xml @@ -2,7 +2,7 @@ From c9c75b8d9f8ef11958d8faf3d78bdb67f507a1ec Mon Sep 17 00:00:00 2001 From: JoseMRLC Date: Tue, 15 Oct 2024 14:59:08 +0200 Subject: [PATCH 5/8] BackEnd funcional --- .../core/service/IStudentBootcampService.java | 3 +++ .../model/core/dao/StudentBootcampDao.java | 7 ++++++ .../core/service/StudentBootcampService.java | 6 ++++- .../main/resources/dao/StudentBootcampDao.xml | 24 +++++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/cd2024bfs4g1-api/src/main/java/com/campusdual/cd2024bfs4g1/api/core/service/IStudentBootcampService.java b/cd2024bfs4g1-api/src/main/java/com/campusdual/cd2024bfs4g1/api/core/service/IStudentBootcampService.java index 9da0ffbd8..88f79a9df 100644 --- a/cd2024bfs4g1-api/src/main/java/com/campusdual/cd2024bfs4g1/api/core/service/IStudentBootcampService.java +++ b/cd2024bfs4g1-api/src/main/java/com/campusdual/cd2024bfs4g1/api/core/service/IStudentBootcampService.java @@ -12,4 +12,7 @@ public interface IStudentBootcampService { EntityResult studentBootcampInsert(Map attrMap) throws OntimizeJEERuntimeException; EntityResult studentBootcampDelete(Map keyMap) throws OntimizeJEERuntimeException; + + EntityResult studentsWithBootcampQuery(Map keysValues, List attributes); + } \ No newline at end of file diff --git a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/dao/StudentBootcampDao.java b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/dao/StudentBootcampDao.java index 025a4fa15..4da2f58ea 100644 --- a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/dao/StudentBootcampDao.java +++ b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/dao/StudentBootcampDao.java @@ -1,10 +1,15 @@ package com.campusdual.cd2024bfs4g1.model.core.dao; +import com.ontimize.jee.common.dto.EntityResult; +import com.ontimize.jee.common.dto.EntityResultMapImpl; import com.ontimize.jee.server.dao.common.ConfigurationFile; import com.ontimize.jee.server.dao.jdbc.OntimizeJdbcDaoSupport; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.Map; + @Lazy @Repository(value = "StudentBootcampDao") @ConfigurationFile( @@ -14,4 +19,6 @@ public class StudentBootcampDao extends OntimizeJdbcDaoSupport { public static final String TABLE_ID = "ID"; public static final String STUDENT_ID = "STUDENT_ID"; public static final String BOOTCAMP_ID = "BOOTCAMP_ID"; + + } \ No newline at end of file diff --git a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampService.java b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampService.java index 279c1ff6a..d628d9e02 100644 --- a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampService.java +++ b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/StudentBootcampService.java @@ -9,6 +9,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; @Service("StudentBootcampService") @@ -30,5 +31,8 @@ public EntityResult studentBootcampInsert(Map attrMap) throws On public EntityResult studentBootcampDelete(Map keyMap) throws OntimizeJEERuntimeException { return this.daoHelper.delete(this.studentBootcampDao, keyMap); } - + @Override + public EntityResult studentsWithBootcampQuery(Map keysValues, List attributes) { + return this.daoHelper.query(this.studentBootcampDao, keysValues, attributes); + } } diff --git a/cd2024bfs4g1-model/src/main/resources/dao/StudentBootcampDao.xml b/cd2024bfs4g1-model/src/main/resources/dao/StudentBootcampDao.xml index ab178b756..01ccb2562 100644 --- a/cd2024bfs4g1-model/src/main/resources/dao/StudentBootcampDao.xml +++ b/cd2024bfs4g1-model/src/main/resources/dao/StudentBootcampDao.xml @@ -12,5 +12,29 @@ id id + + + + + + + + + + + + + + From c5ee8923ce1aa29d1e73c80d2a5f83a2b4d095c3 Mon Sep 17 00:00:00 2001 From: JoseMRLC Date: Wed, 16 Oct 2024 12:02:08 +0200 Subject: [PATCH 6/8] bug fixing --- .../main/ngx/src/app/main/bootcamps/bootcamps-routing.module.ts | 2 +- .../src/main/ngx/src/app/shared/app.services.config.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamps-routing.module.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamps-routing.module.ts index f3b2c3c30..b1ceffcac 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamps-routing.module.ts +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamps-routing.module.ts @@ -1,9 +1,9 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { BootcampDetailsComponent } from './bootcamp-details/bootcamp-details.component'; import { BootcampListComponent } from './bootcamp-list/bootcamp-list.component'; const routes: Routes = [ - //AQUI ES DONDE REDIRIGIMOS A LA LISTA SI ESTA VACIA {path:"",redirectTo:"list",pathMatch:"full"}, {path:"list",component:BootcampListComponent}, {path:'list/:id', component: BootcampDetailsComponent}, diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/shared/app.services.config.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/shared/app.services.config.ts index ed27bddbf..9be01367a 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/shared/app.services.config.ts +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/shared/app.services.config.ts @@ -13,4 +13,6 @@ export const SERVICE_CONFIG: Object = { 'bootcamps':{ 'path': '/bootcamps' } + , + }; From fd1811fff93a1153c22d5e6d4069476562ec89a6 Mon Sep 17 00:00:00 2001 From: JoseMRLC Date: Wed, 16 Oct 2024 13:52:31 +0200 Subject: [PATCH 7/8] feat: insert students into bootcamps --- .../bootcamp-details.component.html | 11 +++++---- .../bootcamp-details.component.ts | 11 ++++----- .../student-bootcamp-add.component.css | 0 .../student-bootcamp-add.component.html | 23 +++++++++++++++++++ .../student-bootcamp-add.component.spec.ts | 23 +++++++++++++++++++ .../student-bootcamp-add.component.ts | 21 +++++++++++++++++ .../bootcamp-list.component.html | 2 +- .../bootcamp-list/bootcamp-list.component.ts | 1 - .../bootcamps/bootcamps-routing.module.ts | 3 ++- .../app/main/bootcamps/bootcamps.module.ts | 4 +++- .../ngx/src/app/shared/app.services.config.ts | 3 +++ .../core/service/StudentBootcampService.java | 13 ++++++++++- 12 files changed, 98 insertions(+), 17 deletions(-) create mode 100644 cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.css create mode 100644 cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.html create mode 100644 cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.spec.ts create mode 100644 cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.ts diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html index bc0cf032d..7770735a9 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html @@ -1,9 +1,10 @@ - + - - + visible-columns="name;surnames" query-rows="10" + detail-mode="false" + delete-button="false"> \ No newline at end of file diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts index f92fdd5a3..490a1749b 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts @@ -6,12 +6,9 @@ import { Component } from '@angular/core'; styleUrls: ['./bootcamp-details.component.css'] }) export class BootcampDetailsComponent { - addStudent() { - //TODO: query - console.log("asdf") - } - deleteStudent(){ - //TODO: query - console.log("aaaaa") + addStudent() { + console.log("addStudent"); } + + } diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.css b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.css new file mode 100644 index 000000000..e69de29bb diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.html b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.html new file mode 100644 index 000000000..7267977c3 --- /dev/null +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.html @@ -0,0 +1,23 @@ + + + + + + + + + + + diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.spec.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.spec.ts new file mode 100644 index 000000000..137ef11ca --- /dev/null +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { StudentBootcampAddComponent } from './student-bootcamp-add.component'; + +describe('StudentBootcampAddComponent', () => { + let component: StudentBootcampAddComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ StudentBootcampAddComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(StudentBootcampAddComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.ts new file mode 100644 index 000000000..e802bbbf6 --- /dev/null +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/student-bootcamp-add/student-bootcamp-add.component.ts @@ -0,0 +1,21 @@ +import { Component, ViewChild } from '@angular/core'; +import { OFormComponent } from 'ontimize-web-ngx'; + +@Component({ + selector: 'app-student-bootcamp-add', + templateUrl: './student-bootcamp-add.component.html', + styleUrls: ['./student-bootcamp-add.component.css'] +}) +export class StudentBootcampAddComponent { + + @ViewChild('studentBootcampForm') studentBootcampForm:OFormComponent; + + addStudentBootcamp() { + this.studentBootcampForm.insert(); + } + + + navigateBack() { + window.history.back(); + } +} 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 efc36a6bb..70c5c5d12 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 @@ -8,7 +8,6 @@ show-charts-on-demand-option="false" delete-button="false" selection-mode="none" - detail-mode="false" > attrMap) throws OntimizeJEERuntimeException { - return this.daoHelper.insert(this.studentBootcampDao, attrMap); + try { + return this.daoHelper.insert(this.studentBootcampDao, attrMap); + } catch (DuplicateKeyException e) { + EntityResult entityResultError = new EntityResultMapImpl(); + entityResultError.setCode(EntityResult.OPERATION_WRONG); + entityResultError.setMessage("The student already exists in the bootcamp"); + return entityResultError; + } catch (Exception generalException) { + throw generalException; + } } @Override From c285d527480e28c59c056b0893efce1a0597e25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20V=C3=A1zquez?= Date: Wed, 16 Oct 2024 14:13:05 +0200 Subject: [PATCH 8/8] =?UTF-8?q?eliminado=20m=C3=A9todo=20vac=C3=ADo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bootcamps/bootcamp-details/bootcamp-details.component.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts index 490a1749b..69b669573 100644 --- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts +++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts @@ -6,9 +6,5 @@ import { Component } from '@angular/core'; styleUrls: ['./bootcamp-details.component.css'] }) export class BootcampDetailsComponent { - addStudent() { - console.log("addStudent"); - } - }