From 081fb315068d3aaaa253c82e9661493760c9dd4f Mon Sep 17 00:00:00 2001
From: javi2004 <javiperezotero10@gmail.com>
Date: Thu, 5 Dec 2024 11:27:43 +0100
Subject: [PATCH 1/3] BFS42024-183

css hecho

Va el insertar notas

solucionado todo solo queda poner fechas del dia actual y css

solucionado lo de borrar bootcamps

Componente nuevo creado

Se muestran la lista de las notas de cada alumno

Back empezado para notas

mat notas
---
 .../api/core/service/INotesService.java       |  20 +++
 .../notes-add/notes-add.component.css         |   0
 .../notes-add/notes-add.component.html        |  20 +++
 .../notes-add/notes-add.component.spec.ts     |  23 ++++
 .../notes-add/notes-add.component.ts          |  40 ++++++
 .../students-detail.component.css             |  17 +++
 .../students-detail.component.html            | 115 +++++++++++++++++-
 .../main/students/students-routing.module.ts  |   4 +-
 .../src/app/main/students/students.module.ts  |   4 +-
 .../ngx/src/app/shared/app.services.config.ts |   3 +
 .../src/main/ngx/src/styles.scss              |  24 ++--
 .../cd2024bfs4g1/model/core/dao/NotesDao.java |  21 ++++
 .../model/core/service/NotesService.java      |  41 +++++++
 .../src/main/resources/dao/NotesDao.xml       |  34 ++++++
 .../ws/core/rest/NotesController.java         |  22 ++++
 15 files changed, 373 insertions(+), 15 deletions(-)
 create mode 100644 cd2024bfs4g1-api/src/main/java/com/campusdual/cd2024bfs4g1/api/core/service/INotesService.java
 create mode 100644 cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.css
 create mode 100644 cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.html
 create mode 100644 cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.spec.ts
 create mode 100644 cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.ts
 create mode 100644 cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/dao/NotesDao.java
 create mode 100644 cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/NotesService.java
 create mode 100644 cd2024bfs4g1-model/src/main/resources/dao/NotesDao.xml
 create mode 100644 cd2024bfs4g1-ws/src/main/java/com/campusdual/cd2024bfs4g1/ws/core/rest/NotesController.java

diff --git a/cd2024bfs4g1-api/src/main/java/com/campusdual/cd2024bfs4g1/api/core/service/INotesService.java b/cd2024bfs4g1-api/src/main/java/com/campusdual/cd2024bfs4g1/api/core/service/INotesService.java
new file mode 100644
index 000000000..20508ef8b
--- /dev/null
+++ b/cd2024bfs4g1-api/src/main/java/com/campusdual/cd2024bfs4g1/api/core/service/INotesService.java
@@ -0,0 +1,20 @@
+package com.campusdual.cd2024bfs4g1.api.core.service;
+
+import com.ontimize.jee.common.dto.EntityResult;
+import com.ontimize.jee.common.exceptions.OntimizeJEERuntimeException;
+
+import java.util.List;
+import java.util.Map;
+
+public interface INotesService {
+
+    EntityResult notesInsert(Map<String, Object> attrMap) throws OntimizeJEERuntimeException;
+
+    EntityResult notesDelete(Map<String, Object> keyMap) throws OntimizeJEERuntimeException;
+
+    EntityResult notesQuery(Map<String, Object> keysValues, List<String> attributes);
+
+
+
+
+}
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.css b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.html b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.html
new file mode 100644
index 000000000..75074449c
--- /dev/null
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.html
@@ -0,0 +1,20 @@
+<div>
+    <o-form #notesForm service="notes" entity="notes" show-header="no" confirm-exit="false"
+      undo-button="false" label-header-align="center" after-insert-mode="close">
+      <o-text-input attr="id_students" sql-type="INTEGER" enabled="no" hidden></o-text-input>
+      <!-- Campo de texto -->
+      <o-text-input attr="nota" sql-type="VARCHAR" required="yes" placeholder="Escribe tu texto aquí"></o-text-input>
+
+      <!-- Label con la fecha actual -->
+      <div>
+        <label>{{ todayDate }}</label>
+      </div>
+
+      <o-date-input #date  label-visible="false" attr="fecha" format="DD/MM/YYYY"></o-date-input>
+      <!-- Botón de acción -->
+      <div fxLayout="row" fxLayoutGap="16px" fxLayoutWrap style="margin-top: 10px;">
+        <o-button attr="addbutton" id="Add" type="RAISED" label="Add" color="primary" (click)="addNotes()"></o-button>
+      </div>
+
+    </o-form>
+  </div>
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.spec.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.spec.ts
new file mode 100644
index 000000000..3bcf4e2d6
--- /dev/null
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NotesAddComponent } from './notes-add.component';
+
+describe('NotesAddComponent', () => {
+  let component: NotesAddComponent;
+  let fixture: ComponentFixture<NotesAddComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ NotesAddComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(NotesAddComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.ts
new file mode 100644
index 000000000..eba49bf3e
--- /dev/null
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.ts
@@ -0,0 +1,40 @@
+import { Component, ViewChild } from '@angular/core';
+import { ODateInputComponent, OFormComponent } from 'ontimize-web-ngx';
+
+@Component({
+  selector: 'app-notes-add',
+  templateUrl: './notes-add.component.html',
+  styleUrls: ['./notes-add.component.css']
+})
+export class NotesAddComponent {
+  todayDate: string = '';
+  todayTimestamp: number = 0;
+  @ViewChild('notesForm') notesForm: OFormComponent;
+  @ViewChild('date') date: ODateInputComponent;
+
+  ngOnInit() {
+
+    const today = new Date();
+    const day = today.getDate().toString().padStart(2, '0');
+    const month = (today.getMonth() + 1).toString().padStart(2, '0');
+    const year = today.getFullYear();
+    this.todayDate = `${day}/${month}/${year}`;
+
+
+    const [dd, mm, yyyy] = this.todayDate.split('/').map(Number);
+    const parsedDate = new Date(yyyy, mm - 1, dd);
+    this.todayTimestamp = parsedDate.getTime();
+
+  }
+
+  ngAfterViewInit() {
+    if (this.date) {
+      this.date.setValue(this.todayTimestamp);
+      console.log("TiSt"+this.todayTimestamp);
+      console.log("Date: "+ this.date.getValue().toString());
+    }
+  }
+  addNotes() {
+    this.notesForm.insert();
+  }
+}
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 f492d2fff..e6c7600e4 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
@@ -241,6 +241,9 @@ padding: 0;
 .user-grid {
 grid-column: 1 / 2;
 }
+.fct-container fieldset {
+width: 100%;
+}
 .documentsGrid {
 grid-column: 1 / 3;
 }
@@ -317,3 +320,17 @@ grid-column: 1 / 3;
   font-size: 12px;
   color: #1a3459;
 }
+
+.notas {
+  margin: 10px;
+  overflow: hidden;
+}
+.fromatotextotitulo{
+  font-size: 15px;
+}
+.fromatotexto{
+  font-size: 17px;
+  color: black;
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
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 053cefed9..d58dd9837 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
@@ -13,11 +13,10 @@
           <legend>{{"Personal data"|oTranslate}}</legend>
           <div class="datosPrincipales1">
             <div class="foto">
-              <o-image #UsrPhoto attr="usr_photo" empty-image="assets/images/no-image.png"
-                       sql-type="OTHER" class="avatar" (onChange)="onImageChange($event)"
-                       max-file-size="409600" accept-file-type="image/png,image/jpeg,image/gif,image/jpg"
-                       label="PROFILE.EDIT_PHOTO" ></o-image>
-                       <p class="p_info_foto">{{'Info_foto' | oTranslate}}</p>
+              <o-image #UsrPhoto attr="usr_photo" empty-image="assets/images/no-image.png" sql-type="OTHER"
+                class="avatar" (onChange)="onImageChange($event)" max-file-size="409600"
+                accept-file-type="image/png,image/jpeg,image/gif,image/jpg" label="PROFILE.EDIT_PHOTO"></o-image>
+              <p class="p_info_foto">{{'Info_foto' | oTranslate}}</p>
             </div>
 
             <div>
@@ -78,6 +77,7 @@
               columns="id;status" value-column="id" description-columns="status" query-on-init="true" sort="ASC">
             </o-combo>
           </div>
+
         </fieldset>
       </div>
         <div class="gridDatos">
@@ -245,6 +245,91 @@ <h3>{{ 'Historial_Laboral' | oTranslate }}</h3>
             </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>
+        <fieldset title="Notas">
+          <div class="general_container">
+            <legend for="LNOTES">{{'LNOTES' | oTranslate}}</legend>
+
+          </div>
+
+
+        </fieldset>
+      </div>
+      <div *ngIf="showMessage" class="notification">
+        <label for="subida">{{ 'subida' | oTranslate }}</label>
+      </div>
+
+
+
+    </mat-tab>
+    <mat-tab label="{{'DocumentsAndBootc'|oTranslate}}">
+      <div class="documentsGrid">
+        <o-form-layout-manager>
+          <div class="container_students">
+            <fieldset class="fieldsetDoc">
+              <legend>{{'STUDENT_FILES' | oTranslate}} </legend>
+              <div class="separadorFile">
+                <o-file-input class="o-file-input" #fileinput attr="file" label="{{ 'Upload Document' | oTranslate }}"
+                  service="documents" entity="upload" max-file-size="1000000" multiple="yes" max-num-files="5"
+                  split-upload="false" key="student_id" [additional-data]="getFileData()" (input)="onFileUpload()"
+                  (onUpload)="onUploadFiles($event)" (onError)="onError($event)">
+                </o-file-input>
+                <o-button class="o-form-toolbar-button" (click)="refreshFileInput()" label="{{ 'CLEAR' | oTranslate }}"
+                  color="primary"></o-button>
+              </div>
+              <o-table #documentsTable class="general_table_primera" attr="documentsTable" service="documents"
+                entity="studentdocument" keys="id" parent-keys="student_id:id" columns="id;name" visible-columns="name"
+                detail-mode="false" show-report-on-demand-option="false" show-charts-on-demand-option="false"
+                refresh-button="false" insert-button="false" quick-filter="false"
+                show-paginator-first-last-buttons="false" select-all-checkbox-visible="true" selection-mode="none"
+                pagination-controls="no">
+                <o-table-context-menu view-detail="false" edit="false" delete="false"
+                  insert="false"></o-table-context-menu>
+                <o-table-column attr="name" title="Document title"></o-table-column>
+                <o-table-column attr="Download" width="10px">
+                  <o-table-cell-renderer-action (onClick)="actionClick($event)"
+                    icon="download"></o-table-cell-renderer-action>
+                </o-table-column>
+              </o-table>
+            </fieldset>
+          </div>
+        </o-form-layout-manager>
+        <div class="estudiantesDocumentos">
+          <o-form-layout-manager class="selectedrow" attr="addBootcampLayout" mode="dialog">
+            <o-form-layout-dialog-options class="popup">
+              <fieldset class="fieldsetDoc">
+                <legend align="left">{{'Bootcamps Asigned' | oTranslate}}</legend>
+                <o-table class="general_table_segunda" attr="bootcampsStudentTable" service="studentBootcamps"
+                  entity="studentsWithBootcamp" keys="id" parent-keys="student_id:id"
+                  columns="id;bootcampname;status;start_date;end_date"
+                  visible-columns="bootcampname;status;start_date;end_date" detail-mode="none"
+                  show-report-on-demand-option="false" show-charts-on-demand-option="false"
+                  select-all-checkbox-visible="true" quick-filter="false" selection-mode="none" insert-form-route="new">
+                  <o-table-paginator page-size="20" page-size-options="10;20;40"></o-table-paginator>
+                  <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="start_date" title="DayStart" type="date" format="DD/MM/YYYY"></o-table-column>
+                  <o-table-column attr="end_date" title="DayEnd" type="date" format="DD/MM/YYYY"></o-table-column>
+                </o-table>
+              </fieldset>
+            </o-form-layout-dialog-options>
+          </o-form-layout-manager>
+        </div>
+        <div *ngIf="showMessage" class="notification">
+          <label for="subida">{{ 'subida' | oTranslate }}</label>
+        </div>
         <div class="notes">
           <fieldset title="Notas">
             <legend for="LNOTES">{{'LNOTES' | oTranslate}}</legend>
@@ -256,5 +341,25 @@ <h3>{{ 'Historial_Laboral' | oTranslate }}</h3>
         <label for="subida">{{ 'subida' | oTranslate }}</label>
       </div>
     </mat-tab>
+    <mat-tab label="{{'LNOTE' | oTranslate}}">
+
+      <o-form-layout-manager class="selectedrow" mode="dialog">
+        <o-form-layout-dialog-options class="popup">
+          <o-list #list attr="notesList" service="notes" entity="notes" keys="id" parent-keys="id_students:id" insert-button="true"
+            delete-button="true" insert-form-route="new_note" columns="id;nota;id_students;fecha" quick-filter="false"
+            refresh-button="false" insert-button="true" delete-button="true" detail-mode="true" selectable="true"
+            detail-button-in-row="true" edit-button-in-row="false" pagination-controls="false"
+            insert-button-position="" show-buttons-text="false" controls="false">
+            <mat-card class="notas list_container o-list-container" #idNota *ngFor="let notas of list.dataArray">
+              <mat-card-header >
+                <mat-card-title class="fromatotextotitulo"><a>{{ notas.fecha | date:'dd/MM/yyyy' }}</a></mat-card-title>
+                <mat-card-subtitle class="fromatotexto">{{ notas.nota }} </mat-card-subtitle>
+              </mat-card-header>
+            </mat-card>
+
+          </o-list>
+        </o-form-layout-dialog-options>
+      </o-form-layout-manager>
+    </mat-tab>
   </mat-tab-group>
 </o-form>
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-routing.module.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-routing.module.ts
index 932e7652c..8033800c9 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-routing.module.ts
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-routing.module.ts
@@ -6,15 +6,17 @@ import { StudentsTableComponent } from './students-table/students-table.componen
 import { BootcampStudentAddComponent } from './students-detail/bootcamp-student-add/bootcamp-student-add.component';
 import { EmploymentHistoryNewComponent } from './students-detail/employment-history-new/employment-history-new.component';
 import { EmploymentHistoryDetailsComponent } from './students-detail/employment-history-details/employment-history-details.component';
+import { NotesAddComponent } from './students-detail/notes-add/notes-add.component';
 
 
 const routes: Routes = [
   { path:'', pathMatch:'full', component: StudentsTableComponent},
   { path:"new", component:StudentsNewComponent},
   { path:":student_id/new", component:BootcampStudentAddComponent},
+  {path:':student_id/new_note', component: NotesAddComponent},
   { path:":student_id/new_employment_history", component:EmploymentHistoryNewComponent},
   { path:":student_id/:id", component:EmploymentHistoryDetailsComponent},
-  { path:":id", component:StudentsDetailComponent}
+  { path:":id", component:StudentsDetailComponent},
 ];
 
 @NgModule({
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students.module.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students.module.ts
index 94d44d998..7b6b8a5e4 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students.module.ts
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students.module.ts
@@ -13,6 +13,7 @@ import { MatIconRegistry } from '@angular/material/icon';
 import { DomSanitizer } from '@angular/platform-browser';
 import { EmploymentHistoryNewComponent } from './students-detail/employment-history-new/employment-history-new.component';
 import { EmploymentHistoryDetailsComponent } from './students-detail/employment-history-details/employment-history-details.component';
+import { NotesAddComponent } from './students-detail/notes-add/notes-add.component';
 
 
 @NgModule({
@@ -22,7 +23,8 @@ import { EmploymentHistoryDetailsComponent } from './students-detail/employment-
     StudentsTableComponent,
     BootcampStudentAddComponent,
     EmploymentHistoryNewComponent,
-    EmploymentHistoryDetailsComponent
+    EmploymentHistoryDetailsComponent,
+    NotesAddComponent
   ],
   imports: [
     CommonModule,
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 9d52666dd..db6dbe2b7 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
@@ -37,6 +37,9 @@ export const SERVICE_CONFIG: Object = {
   },
   'employmentstatushistory':{
     'path': '/employmentstatushistory'
+  },
+  'notes':{    
+     'path': '/notes'
   }
 
 };
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/styles.scss b/cd2024bfs4g1-frontend/src/main/ngx/src/styles.scss
index d569daaf4..45ab9f75d 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/styles.scss
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/styles.scss
@@ -324,22 +324,22 @@ label{
 background: none;
 }
 .list_container .o-list-container {
-  position: relative; 
+  position: relative;
 }
 
 .list_container .o-list-container .add-button {
-  position: absolute; 
-  right: 10px;        
-  top: -40px;          
+  position: absolute;
+  right: 10px;
+  top: -40px;
   background-color: #8AB237;
   color: #1a3459;
   border-radius: 8px;
   width: 100px;
   height: 30px;
-  display: flex;      
+  display: flex;
   justify-content: center;
   align-items: center;
- 
+
 }
 
 o-column.o-column .o-container > .o-container-title span{
@@ -379,8 +379,8 @@ o-column.o-column .o-container > .o-container-title span{
 
   margin: 16px;
 }
-.o-form .o-form-toolbar .o-form-toolbar-header 
-.mat-toolbar-tools .o-form-toolbar-button, .o-form .o-form-toolbar 
+.o-form .o-form-toolbar .o-form-toolbar-header
+.mat-toolbar-tools .o-form-toolbar-button, .o-form .o-form-toolbar
 .o-form-toolbar-header .mat-toolbar-tools .o-form-toolbar-button[disabled]{
   border-radius:10px;
 }
@@ -389,3 +389,11 @@ o-column.o-column .o-container > .o-container-title span{
   border-radius: 10px;
  }
 
+
+
+
+ .mat-mdc-fab.mat-primary, .mat-mdc-mini-fab.mat-primary, .mat-mdc-fab.mat-accent, .mat-mdc-mini-fab.mat-accent {
+  --mdc-fab-container-color: #7ec117;
+  --mat-mdc-fab-color: #1a3459;
+  margin-bottom: 20px;
+}
diff --git a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/dao/NotesDao.java b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/dao/NotesDao.java
new file mode 100644
index 000000000..72fe2db05
--- /dev/null
+++ b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/dao/NotesDao.java
@@ -0,0 +1,21 @@
+package com.campusdual.cd2024bfs4g1.model.core.dao;
+
+
+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;
+
+@Lazy
+@Repository(value = "NotesDao")
+@ConfigurationFile(
+        configurationFile = "dao/NotesDao.xml",
+        configurationFilePlaceholder = "dao/placeholders.properties")
+public class NotesDao extends OntimizeJdbcDaoSupport {
+
+    public static final String ATTR_ID = "id";
+    public static final String ATTR_ID_STUDENTS = "id_students";
+    public static final String ATTR_NOTA = "nota";
+    public static final String ATTR_FECHA = "fecha";
+
+}
diff --git a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/NotesService.java b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/NotesService.java
new file mode 100644
index 000000000..6038196a0
--- /dev/null
+++ b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/NotesService.java
@@ -0,0 +1,41 @@
+package com.campusdual.cd2024bfs4g1.model.core.service;
+
+import com.campusdual.cd2024bfs4g1.api.core.service.INotesService;
+
+import com.campusdual.cd2024bfs4g1.model.core.dao.NotesDao;
+import com.ontimize.jee.common.dto.EntityResult;
+import com.ontimize.jee.common.exceptions.OntimizeJEERuntimeException;
+import com.ontimize.jee.server.dao.DefaultOntimizeDaoHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+@Service("NotesService")
+@Lazy public class NotesService implements INotesService {
+
+    @Autowired
+    private NotesDao notesDao;
+
+    @Autowired
+    private DefaultOntimizeDaoHelper daoHelper;
+    @Override
+    public EntityResult notesInsert(Map<String, Object> attrMap) throws OntimizeJEERuntimeException {
+        return this.daoHelper.insert(this.notesDao, attrMap);
+    }
+
+
+
+    @Override
+    public EntityResult notesDelete(Map<String, Object> keyMap) throws OntimizeJEERuntimeException {
+        return this.daoHelper.delete(this.notesDao, keyMap);
+    }
+
+    @Override
+    public EntityResult notesQuery(Map<String, Object> keyMap, List<String> attrList) {
+        return this.daoHelper.query(this.notesDao, keyMap, attrList);
+    }
+
+
+}
diff --git a/cd2024bfs4g1-model/src/main/resources/dao/NotesDao.xml b/cd2024bfs4g1-model/src/main/resources/dao/NotesDao.xml
new file mode 100644
index 000000000..1905461a9
--- /dev/null
+++ b/cd2024bfs4g1-model/src/main/resources/dao/NotesDao.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<JdbcEntitySetup xmlns="http://www.ontimize.com/schema/jdbc"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="http://www.ontimize.com/schema/jdbc http://www.ontimize.com/schema/jdbc/ontimize-jdbc-dao.xsd"
+                 catalog="" schema="${mainschema}" table="notas" datasource="mainDataSource"
+                 sqlhandler="dbSQLStatementHandler">
+    <DeleteKeys>
+        <Column>id</Column>
+    </DeleteKeys>
+    <UpdateKeys>
+        <Column>id</Column>
+    </UpdateKeys>
+    <GeneratedKey>id</GeneratedKey>
+    <Queries>
+        <Query id="default">
+            <AmbiguousColumns>
+                <AmbiguousColumn name="id" prefix="s"/>
+
+            </AmbiguousColumns>
+
+            <Sentence>
+                <![CDATA[
+     select
+      #COLUMNS#
+     from
+      notas n
+     inner join
+      students s on n.id_students = s.id
+     #WHERE#
+   ]]>
+            </Sentence>
+        </Query>
+    </Queries>
+</JdbcEntitySetup>
\ No newline at end of file
diff --git a/cd2024bfs4g1-ws/src/main/java/com/campusdual/cd2024bfs4g1/ws/core/rest/NotesController.java b/cd2024bfs4g1-ws/src/main/java/com/campusdual/cd2024bfs4g1/ws/core/rest/NotesController.java
new file mode 100644
index 000000000..10efb0772
--- /dev/null
+++ b/cd2024bfs4g1-ws/src/main/java/com/campusdual/cd2024bfs4g1/ws/core/rest/NotesController.java
@@ -0,0 +1,22 @@
+package com.campusdual.cd2024bfs4g1.ws.core.rest;
+
+
+import com.campusdual.cd2024bfs4g1.api.core.service.INotesService;
+
+import com.ontimize.jee.server.rest.ORestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/notes")
+public class NotesController extends ORestController<INotesService> {
+
+    @Autowired
+    private INotesService notesService;
+
+    @Override
+    public INotesService getService() {
+        return this.notesService;
+    }
+}

From 6528f9ef413b0c01dc702852658c1598858425d0 Mon Sep 17 00:00:00 2001
From: eluiui <jesusmiguez@gmail.com>
Date: Mon, 9 Dec 2024 14:33:46 +0100
Subject: [PATCH 2/3] hecho

---
 .../students-detail/notes-add/notes-add.component.css  |  3 +++
 .../students-detail/notes-add/notes-add.component.html | 10 +++++-----
 .../students-detail/students-detail.component.css      |  2 ++
 .../src/main/ngx/src/assets/i18n/en.json               |  2 ++
 .../src/main/ngx/src/assets/i18n/es.json               |  3 ++-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.css b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.css
index e69de29bb..d4b3b6068 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.css
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.css
@@ -0,0 +1,3 @@
+.espaciador{
+    margin-bottom: 10px;
+}
\ No newline at end of file
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.html b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.html
index 75074449c..9696c9719 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.html
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/notes-add/notes-add.component.html
@@ -2,15 +2,15 @@
     <o-form #notesForm service="notes" entity="notes" show-header="no" confirm-exit="false"
       undo-button="false" label-header-align="center" after-insert-mode="close">
       <o-text-input attr="id_students" sql-type="INTEGER" enabled="no" hidden></o-text-input>
-      <!-- Campo de texto -->
-      <o-text-input attr="nota" sql-type="VARCHAR" required="yes" placeholder="Escribe tu texto aquí"></o-text-input>
 
-      <!-- Label con la fecha actual -->
-      <div>
+      <div class="espaciador">
         <label>{{ todayDate }}</label>
       </div>
+      <!-- Campo de texto -->
+      <label for="LNOTE" class="espaciador">{{'LNOTE' | oTranslate}}</label>
+      <o-text-input attr="nota" sql-type="VARCHAR" required="yes"></o-text-input>
 
-      <o-date-input #date  label-visible="false" attr="fecha" format="DD/MM/YYYY"></o-date-input>
+      <o-date-input #date  label-visible="false" attr="fecha" format="DD/MM/YYYY" hidden></o-date-input>
       <!-- Botón de acción -->
       <div fxLayout="row" fxLayoutGap="16px" fxLayoutWrap style="margin-top: 10px;">
         <o-button attr="addbutton" id="Add" type="RAISED" label="Add" color="primary" (click)="addNotes()"></o-button>
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 e6c7600e4..cd5fb4639 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
@@ -333,4 +333,6 @@ grid-column: 1 / 3;
   color: black;
   padding-top: 10px;
   padding-bottom: 10px;
+  padding-right: 10px;
 }
+
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 cd1149dae..8b110518c 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json
@@ -298,4 +298,6 @@
   "Download" : "Download",
   "Save": "Save",
   "TUTOR_HAS_BOOTCAMPS":"The mentor has assigned bootcamps and cannot be deleted"
+  "Save": "Save",
+  "nota":"Notes"
 }
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 1231515a6..3d9d4be84 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json
@@ -294,5 +294,6 @@
   "date_change":"Fecha del cambio",
   "DUPLICATED_USRLOGIN_NAME": "El nombre de usuario ya existe",
   "Download" : "Descargar",
-  "Save": "Guardar"
+  "Save": "Guardar",
+  "nota":"Notas"
 }

From e0ad0509d5b152579dc33996afb8633cf485b52a Mon Sep 17 00:00:00 2001
From: javi2004 <javiperezotero10@gmail.com>
Date: Thu, 5 Dec 2024 11:27:43 +0100
Subject: [PATCH 3/3] BFS42024-183

---
 .../students-detail.component.css             | 17 ++++
 .../students-detail.component.html            | 90 ++-----------------
 .../src/main/ngx/src/assets/i18n/en.json      |  3 +-
 .../src/main/resources/dao/NotesDao.xml       |  2 +-
 .../db/migration/V33__create_table_notes.sql  |  8 ++
 5 files changed, 33 insertions(+), 87 deletions(-)
 create mode 100644 cd2024bfs4g1-model/src/main/resources/db/migration/V33__create_table_notes.sql

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 cd5fb4639..61b5c0e22 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
@@ -336,3 +336,20 @@ grid-column: 1 / 3;
   padding-right: 10px;
 }
 
+div.notification label {
+  background-color: #8AB237;
+  color: white;
+  padding: 10px;
+  position: fixed;
+  bottom: 20px;
+  right: 20px;
+  border-radius: 5px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  opacity: 1;
+  transition: opacity 0.5s ease;
+}
+
+.notification.hide {
+  opacity: 0;
+}
+
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 d58dd9837..1c16f6e92 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
@@ -257,95 +257,13 @@ <h3>{{ 'Historial_Laboral' | oTranslate }}</h3>
             </div>
           </div>
         </fieldset>
-        <fieldset title="Notas">
-          <div class="general_container">
-            <legend for="LNOTES">{{'LNOTES' | oTranslate}}</legend>
-
-          </div>
-
-
-        </fieldset>
-      </div>
-      <div *ngIf="showMessage" class="notification">
-        <label for="subida">{{ 'subida' | oTranslate }}</label>
-      </div>
-
-
-
-    </mat-tab>
-    <mat-tab label="{{'DocumentsAndBootc'|oTranslate}}">
-      <div class="documentsGrid">
-        <o-form-layout-manager>
-          <div class="container_students">
-            <fieldset class="fieldsetDoc">
-              <legend>{{'STUDENT_FILES' | oTranslate}} </legend>
-              <div class="separadorFile">
-                <o-file-input class="o-file-input" #fileinput attr="file" label="{{ 'Upload Document' | oTranslate }}"
-                  service="documents" entity="upload" max-file-size="1000000" multiple="yes" max-num-files="5"
-                  split-upload="false" key="student_id" [additional-data]="getFileData()" (input)="onFileUpload()"
-                  (onUpload)="onUploadFiles($event)" (onError)="onError($event)">
-                </o-file-input>
-                <o-button class="o-form-toolbar-button" (click)="refreshFileInput()" label="{{ 'CLEAR' | oTranslate }}"
-                  color="primary"></o-button>
-              </div>
-              <o-table #documentsTable class="general_table_primera" attr="documentsTable" service="documents"
-                entity="studentdocument" keys="id" parent-keys="student_id:id" columns="id;name" visible-columns="name"
-                detail-mode="false" show-report-on-demand-option="false" show-charts-on-demand-option="false"
-                refresh-button="false" insert-button="false" quick-filter="false"
-                show-paginator-first-last-buttons="false" select-all-checkbox-visible="true" selection-mode="none"
-                pagination-controls="no">
-                <o-table-context-menu view-detail="false" edit="false" delete="false"
-                  insert="false"></o-table-context-menu>
-                <o-table-column attr="name" title="Document title"></o-table-column>
-                <o-table-column attr="Download" width="10px">
-                  <o-table-cell-renderer-action (onClick)="actionClick($event)"
-                    icon="download"></o-table-cell-renderer-action>
-                </o-table-column>
-              </o-table>
-            </fieldset>
-          </div>
-        </o-form-layout-manager>
-        <div class="estudiantesDocumentos">
-          <o-form-layout-manager class="selectedrow" attr="addBootcampLayout" mode="dialog">
-            <o-form-layout-dialog-options class="popup">
-              <fieldset class="fieldsetDoc">
-                <legend align="left">{{'Bootcamps Asigned' | oTranslate}}</legend>
-                <o-table class="general_table_segunda" attr="bootcampsStudentTable" service="studentBootcamps"
-                  entity="studentsWithBootcamp" keys="id" parent-keys="student_id:id"
-                  columns="id;bootcampname;status;start_date;end_date"
-                  visible-columns="bootcampname;status;start_date;end_date" detail-mode="none"
-                  show-report-on-demand-option="false" show-charts-on-demand-option="false"
-                  select-all-checkbox-visible="true" quick-filter="false" selection-mode="none" insert-form-route="new">
-                  <o-table-paginator page-size="20" page-size-options="10;20;40"></o-table-paginator>
-                  <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="start_date" title="DayStart" type="date" format="DD/MM/YYYY"></o-table-column>
-                  <o-table-column attr="end_date" title="DayEnd" type="date" format="DD/MM/YYYY"></o-table-column>
-                </o-table>
-              </fieldset>
-            </o-form-layout-dialog-options>
-          </o-form-layout-manager>
-        </div>
-        <div *ngIf="showMessage" class="notification">
-          <label for="subida">{{ 'subida' | oTranslate }}</label>
-        </div>
-        <div class="notes">
-          <fieldset title="Notas">
-            <legend for="LNOTES">{{'LNOTES' | oTranslate}}</legend>
-            <o-textarea-input attr="notes" required="no" max-length="1000"></o-textarea-input>
-          </fieldset>
-        </div>
-      </div>
-      <div *ngIf="showMessage" class="notification">
-        <label for="subida">{{ 'subida' | oTranslate }}</label>
       </div>
     </mat-tab>
     <mat-tab label="{{'LNOTE' | oTranslate}}">
 
       <o-form-layout-manager class="selectedrow" mode="dialog">
         <o-form-layout-dialog-options class="popup">
-          <o-list #list attr="notesList" service="notes" entity="notes" keys="id" parent-keys="id_students:id" insert-button="true"
+          <o-list #list attr="notesList" sort-columns="id:DESC" service="notes" entity="notes" keys="id" parent-keys="id_students:id" insert-button="true"
             delete-button="true" insert-form-route="new_note" columns="id;nota;id_students;fecha" quick-filter="false"
             refresh-button="false" insert-button="true" delete-button="true" detail-mode="true" selectable="true"
             detail-button-in-row="true" edit-button-in-row="false" pagination-controls="false"
@@ -361,5 +279,9 @@ <h3>{{ 'Historial_Laboral' | oTranslate }}</h3>
         </o-form-layout-dialog-options>
       </o-form-layout-manager>
     </mat-tab>
+
   </mat-tab-group>
-</o-form>
+  <div *ngIf="showMessage" class="notification">
+    <label for="subida">{{ 'subida' | oTranslate }}</label>
+  </div>
+</o-form>
\ No newline at end of file
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 8b110518c..38c95fa57 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json
@@ -297,7 +297,6 @@
   "DUPLICATED_USRLOGIN_NAME":"Username already exists",
   "Download" : "Download",
   "Save": "Save",
-  "TUTOR_HAS_BOOTCAMPS":"The mentor has assigned bootcamps and cannot be deleted"
-  "Save": "Save",
+  "TUTOR_HAS_BOOTCAMPS":"The mentor has assigned bootcamps and cannot be deleted",
   "nota":"Notes"
 }
diff --git a/cd2024bfs4g1-model/src/main/resources/dao/NotesDao.xml b/cd2024bfs4g1-model/src/main/resources/dao/NotesDao.xml
index 1905461a9..f8382970d 100644
--- a/cd2024bfs4g1-model/src/main/resources/dao/NotesDao.xml
+++ b/cd2024bfs4g1-model/src/main/resources/dao/NotesDao.xml
@@ -14,7 +14,7 @@
     <Queries>
         <Query id="default">
             <AmbiguousColumns>
-                <AmbiguousColumn name="id" prefix="s"/>
+                <AmbiguousColumn name="id" prefix="n"/>
 
             </AmbiguousColumns>
 
diff --git a/cd2024bfs4g1-model/src/main/resources/db/migration/V33__create_table_notes.sql b/cd2024bfs4g1-model/src/main/resources/db/migration/V33__create_table_notes.sql
new file mode 100644
index 000000000..860a21338
--- /dev/null
+++ b/cd2024bfs4g1-model/src/main/resources/db/migration/V33__create_table_notes.sql
@@ -0,0 +1,8 @@
+CREATE TABLE public.notas (
+	id serial4 NOT NULL,
+	id_students int4 NOT NULL,
+	nota varchar(500) NOT NULL,
+	fecha timestamptz NOT NULL,
+	CONSTRAINT notas_pk PRIMARY KEY (id),
+	CONSTRAINT notas_students_fk FOREIGN KEY (id_students) REFERENCES public.students(id)
+);
\ No newline at end of file