Skip to content
This repository has been archived by the owner on Feb 4, 2025. It is now read-only.

Commit

Permalink
BFS42024-183
Browse files Browse the repository at this point in the history
  • Loading branch information
@javi2004
javi2004 authored and eluiui committed Dec 10, 2024
1 parent 6528f9e commit e0ad050
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 87 deletions.
17 changes: 17 additions & 0 deletions ...frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

90 changes: 6 additions & 84 deletions ...rontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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>
3 changes: 1 addition & 2 deletions cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion cd2024bfs4g1-model/src/main/resources/dao/NotesDao.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<Queries>
<Query id="default">
<AmbiguousColumns>
<AmbiguousColumn name="id" prefix="s"/>
<AmbiguousColumn name="id" prefix="n"/>

</AmbiguousColumns>

Expand Down
8 changes: 8 additions & 0 deletions cd2024bfs4g1-model/src/main/resources/db/migration/V33__create_table_notes.sql
View file
Original file line number Diff line number Diff line change
@@ -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)
);

0 comments on commit e0ad050

Please sign in to comment.