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

Commit

Permalink
Merge pull request #271 from CampusDual/develop
Browse files Browse the repository at this point in the history
Pase de tareas a pre
  • Loading branch information
juanjo-alvarez authored Jan 17, 2025
2 parents ec4320c + 81a5788 commit 4ded1fc
Show file tree
Hide file tree
Showing 49 changed files with 432 additions and 316 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ <h3>{{'STUDENTS_IN_BOOTCAMP'| oTranslate}}</h3>
visible-columns="userphotostudent;name;surname1;surname2;student_status;sb_start_date;sb_end_date;Detalle"
sort-columns="name" query-rows="10" show-report-on-demand-option="false"query-on-init="true" pageable="true"
show-charts-on-demand-option="false" select-all-checkbox-visible="true" selection-mode="multiple"
detail-mode="click">
detail-mode="click" (onDataLoaded)="loadBootcamp()">
<o-table-column attr="sb_start_date" title="start_date" type="date"
format="DD/MM/YYYY"></o-table-column>
<o-table-column attr="sb_end_date" title="end_date" type="date" format="DD/MM/YYYY"></o-table-column>
Expand Down Expand Up @@ -276,7 +276,7 @@ <h3>{{ 'BootcampDoc' | oTranslate }}</h3>
</div>
</mat-tab>
<mat-tab label="{{'Asistencia'|oTranslate}}">
<app-calendar-attendance [bootcampId]="bootcampId"></app-calendar-attendance>
<app-calendar-attendance #asistencia [bootcampId]="bootcampId"></app-calendar-attendance>
</mat-tab>

</o-form-layout-dialog-options>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { DialogService, Expression, FilterExpressionUtils, OFileInputComponent,
import moment from 'moment';
import { ODateInputComponent, ODateRangeInputComponent, OFormComponent, OntimizeService, OTranslateService } from 'ontimize-web-ngx';
import { MatSlideToggleChange } from '@angular/material/slide-toggle';
import { CalendarAttendanceComponent } from '../../data/personal-tutor-info/calendar-attendance/calendar-attendance.component';

@Component({
selector: 'app-bootcamp-details',
Expand Down Expand Up @@ -361,9 +362,10 @@ export class BootcampDetailsComponent {
this.selectedStatuses = ['Started', 'Pending'];
}
}

@ViewChild('asistencia', { static: true }) asistencia!: CalendarAttendanceComponent;
loadBootcamp() {
this.bootcampId= this.bootcampDetailForm.getFieldValue("id");
this.asistencia.refresh();
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<o-date-input #startDateBootcamp attr="start_date" enabled="no" format="DD/MM/YYYY" hidden="true"></o-date-input>
<o-date-input #endDateBootcamp attr="end_date" enabled="no" format="DD/MM/YYYY" hidden="true"></o-date-input>


<label >{{ 'time_start' | oTranslate }}</label>
<o-hour-input #horai attr="time_start" label="{{ 'TimeStart' | oTranslate }}" sql-type="VARCHAR" text-input-enabled="no" read-only="no" required="yes" clear-button="yes" format="24" value-type="string"></o-hour-input>


<label >{{ 'time_end' | oTranslate }}</label>
<o-hour-input #horaf attr="time_end" label="{{ 'TimeEnd' | oTranslate }}" sql-type="VARCHAR" text-input-enabled="no" read-only="no" required="yes" clear-button="yes" format="24" value-type="string"></o-hour-input>

<div class="textMargi">
<label >{{ 'time_start' | oTranslate }}</label>
<o-hour-input #horai attr="time_start" label="{{ 'TimeStart' | oTranslate }}" sql-type="VARCHAR" text-input-enabled="no" read-only="no" required="yes" clear-button="yes" format="24" value-type="string"></o-hour-input>
</div>
<div class="textMargi">
<label>{{ 'time_end' | oTranslate }}</label>
<o-hour-input #horaf attr="time_end" label="{{ 'TimeEnd' | oTranslate }}" sql-type="VARCHAR" text-input-enabled="no" read-only="no" required="yes" clear-button="yes" format="24" value-type="string"></o-hour-input>
</div>


<div class="especial fecha-inicio">
Expand All @@ -25,7 +25,7 @@
format="DD/MM/YYYY">
</o-date-input>
</div>
<div fxLayout="column" layout-padding>
<div fxLayout="column" class="textMargi" layout-padding>
<label class="input-comp-title">{{ 'Fecha Inicio/Fecha Fin*' | oTranslate }}</label>
<o-daterange-input attr="dateRangeBootcamp" read-only="no"
required="yes" format="DD/MM/YYYY" automatic-binding="false" (onValueChange)="throwChange($event)"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
.textMargi{
margin-right: 10px;
margin-left: 10px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
undo-button="false" label-header-align="center" after-insert-mode="new">
<o-text-input attr="id" sql-type="INTEGER" enabled="no" hidden="true" ></o-text-input>
<o-text-input attr="id_bootcamp" sql-type="INTEGER" enabled="no" hidden="true" ></o-text-input>
<label>{{ 'session_name' | oTranslate }}</label>
<o-text-input class="textMargi" attr="session_name"></o-text-input>
<label>{{ 'session_date' | oTranslate }}</label>
<o-date-input class="textMargi" attr="session_date" ></o-date-input>
<label>{{ 'password' | oTranslate }}</label>
<o-text-input class="textMargi" attr="password"></o-text-input>
<label>{{ 'link' | oTranslate }}</label>
<o-text-input class="textMargi" attr="link"></o-text-input>
<div class="textMargi" >
<label>{{ 'session_name' | oTranslate }}</label>
<o-text-input attr="session_name"></o-text-input>
<label>{{ 'session_date' | oTranslate }}</label>
<o-date-input attr="session_date" ></o-date-input>
<label>{{ 'password' | oTranslate }}</label>
<o-text-input attr="password"></o-text-input>
<label>{{ 'link' | oTranslate }}</label>
<o-text-input attr="link"></o-text-input>
</div>
<div fxLayout="row" fxLayoutGap="16px" fxLayoutWrap style="margin-top: 10px;">
<o-button attr="addbutton" id="Add" type="RAISED" label="Add" color="primary"
(click)="addNewSession()"></o-button>
</div>

</o-form>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,4 @@
font-family: 'Roboto', sans-serif;
}

.popup1 {
width: 600px;
height: 300px;
max-width: 600px;
max-height: 300px;
}

Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
<div class="popup1" >
<div >
<o-form #studentBootcampForm service="studentBootcamps" entity="studentBootcamp" editable-detail="no" show-header="no" confirm-exit="false"
undo-button="false" label-header-align="center" after-insert-mode="new"
(onDataLoaded)="candidate();inicialDR()">
<o-text-input attr="bootcamp_id" sql-type="INTEGER" enabled="no" hidden = "true"></o-text-input>
<div class="textMargi">
<label >{{ 'Estudiante*' | oTranslate }}</label>
<o-combo attr="student_id" label="Students" value-column="id" columns="id;name;surname1;surname2" service="students" label-visible="false"
entity="student" visible-columns="name;surname1;surname2" required="yes" searchable="yes" sortable="yes" sort="ASC" null-selection="no" >
</o-combo>
<o-combo attr="student_id" label="Students" value-column="id" columns="id;name;surname1;surname2" service="students" label-visible="false"
entity="student" visible-columns="name;surname1;surname2" required="yes" searchable="yes" sortable="yes" sort="ASC" null-selection="no" >
</o-combo>
</div>
<div class="textMargi">
<label for="STATUS">{{'STATUS' | oTranslate}}</label>
<o-combo attr="status_id" label="STATUS" required="no" translate="yes"
null-selection="true" read-only="false" service="studentbootcampstatus"
entity="studentBootcampStatus" keys="id" columns="id;student_bootcamp_status" value-column="id"
description-columns="student_bootcamp_status" query-on-init="true">
</o-combo>

<o-combo attr="status_id" label="STATUS" required="no" translate="yes"
null-selection="true" read-only="false" service="studentbootcampstatus"
entity="studentBootcampStatus" keys="id" columns="id;student_bootcamp_status" value-column="id"
description-columns="student_bootcamp_status" query-on-init="true">
</o-combo>
</div>
<div class="especial fecha-inicio">
<o-date-input #startdate label-visible="false" class="fechas" attr="start_date" required="yes" format="DD/MM/YYYY" hidden="true"
></o-date-input>
Expand All @@ -26,7 +29,7 @@
</div>


<div fxLayout="column" layout-padding>
<div fxLayout="column" class="textMargi" layout-padding>
<label class="input-comp-title">{{ 'REQ_Fecha Inicio/Fecha Fin' | oTranslate }}</label>
<o-daterange-input attr="dateRangeBootcamp" read-only="no"
required="yes" format="DD/MM/YYYY" automatic-binding="false" (onValueChange)="throwChange($event)"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="popup1">
<div >
<o-form #studentBootcampForm service="studentBootcamps" entity="studentBootcamp" editable-detail="yes" show-header="no" confirm-exit="false"
undo-button="false" label-header-align="center" after-insert-mode="new" keys="id"
(onDataLoaded)="inicialDR()">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<o-form #tutorBootcampForm service="tutorBootcamps" entity="tutorBootcamp" show-header="no" confirm-exit="false"
undo-button="false" label-header-align="center" after-insert-mode="close" >
<o-text-input attr="bootcamp_id" sql-type="INTEGER" enabled="no" hidden></o-text-input>
<div class="textMargi">
<label>{{ 'Mentors' | oTranslate }}</label>
<o-combo attr="tutor_id" label="Tutors" value-column="id" columns="id;name;surname1;surname2" service="tutors"
label-visible="false" entity="tutor" visible-columns="name;surname1;surname2" required="no" searchable="yes"
Expand All @@ -14,6 +15,7 @@
description-columns="type" query-on-init="true">
</o-combo>
</div>
</div>
<div fxLayout="row" fxLayoutGap="16px" fxLayoutWrap style="margin-top: 10px;">
<o-button attr="addbutton" id="Add" type="RAISED" label="Add" color="primary"
(click)="addTutorBootcamp()"></o-button>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
.textMargi{
margin-right: 10px;
margin-left: 10px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
undo-button="false" label-header-align="center" after-insert-mode="new">
<o-text-input attr="id" sql-type="INTEGER" enabled="no" hidden="true" ></o-text-input>
<o-text-input attr="id_bootcamp" sql-type="INTEGER" enabled="no" hidden="true" ></o-text-input>
<label>{{ 'session_name' | oTranslate }}</label>
<o-text-input class="textMargi" attr="session_name"></o-text-input>
<label>{{ 'session_date' | oTranslate }}</label>
<o-date-input class="textMargi" attr="session_date" ></o-date-input>
<label>{{ 'password' | oTranslate }}</label>
<o-text-input class="textMargi" attr="password"></o-text-input>
<label>{{ 'link' | oTranslate }}</label>
<o-text-input class="textMargi" attr="link"></o-text-input>
<div class="textMargi">
<label>{{ 'session_name' | oTranslate }}</label>
<o-text-input attr="session_name"></o-text-input>
<label>{{ 'session_date' | oTranslate }}</label>
<o-date-input attr="session_date" ></o-date-input>
<label>{{ 'password' | oTranslate }}</label>
<o-text-input attr="password"></o-text-input>
<label>{{ 'link' | oTranslate }}</label>
<o-text-input attr="link"></o-text-input>
</div>
<div fxLayout="row" fxLayoutGap="16px" fxLayoutWrap style="margin-top: 10px;">
<o-button attr="update-button" id="Update" type="RAISED" label="Update" color="primary"
(click)="updateNewSession()"></o-button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export class CommercialSectionComponent {

if (studentId) {
console.log("ID del estudiante:", studentId);
this.router.navigate([`/main/students/${studentId}`]);
this.router.navigate([`/main/students/${studentId}`], { queryParams: { source: 'commercial', id: event.id } });
} else {
console.error("No se encontró el ID del estudiante.");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<o-text-input attr="id" sql-type="INTEGER" enabled="no" hidden></o-text-input>

<div class="grid-container">
<div>
<div class="textMargi">
<label for="REQ_LABBREVIATION">{{'REQ_LABBREVIATION' | oTranslate}}</label>
<o-text-input label-visible="false" attr="abbreviation" required="yes" max-length="1"></o-text-input>
</div>
<div>
<div class="textMargi">
<label for="REQ_LDESCRIPTION">{{'REQ_LDESCRIPTION' | oTranslate}}</label>
<o-text-input label-visible="false" attr="description" required="yes" max-length="50"></o-text-input>
</div>
<div>
<div class="textMargi">
<label for="colorPicker">{{'SelectColor' | oTranslate}}</label>
<input id="colorPicker" type="color" [(ngModel)]="selectedColor" />
<p>{{'SelectedColor' | oTranslate}} {{ selectedColor }}</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
keys="id" show-header="no" header-actions="R;I;U;D" show-header-navigation="no" (onInsert)="volver($event)"
confirm-exit="no">
<div class="grid-container">
<div>
<div class="textMargi">
<label for="REQ_LABBREVIATION">{{'REQ_LABBREVIATION' | oTranslate}}</label>
<o-text-input label-visible="false" attr="abbreviation" required="yes" max-length="1"></o-text-input>
</div>
<div>
<div class="textMargi">
<label for="REQ_LDESCRIPTION">{{'REQ_LDESCRIPTION' | oTranslate}}</label>
<o-text-input label-visible="false" attr="description" required="yes" max-length="50"></o-text-input>
</div>
<div>
<div class="textMargi">
<label for="colorPicker">{{'SelectColor' | oTranslate}}</label>
<input id="colorPicker" type="color" value="#ffffff" [(ngModel)]="selectedColor" onchange="" />
<p>{{'SelectedColor' | oTranslate}} {{ selectedColor }}</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<o-text-input attr="id" sql-type="INTEGER" enabled="no" hidden></o-text-input>

<div class="grid-container">
<div class="employment status">
<div class="textMargi">
<label for="REQ_LEMPLOYMENTSTATUS">{{'REQ_LEMPLOYMENTSTATUS' | oTranslate}}</label>
<o-text-input label-visible="false" attr="situation" required="yes"></o-text-input>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<o-form #employment_status_new attr="employment_status_new" confirm-exit="no" service="employmentstatus" entity="employmentStatus" keys="id" show-header="no"
header-actions="R;I;U;D" show-header-navigation="no" (onInsert)="volver($event)" confirm-exit="no">
<div class="grid-container">
<div>
<div class="textMargi">
<label for="REQ_LSITUATION">{{'REQ_LSITUATION' | oTranslate}}</label>
<o-text-input label-visible="false" attr="situation" required="yes" max-length="40"></o-text-input>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<o-text-input attr="id" sql-type="INTEGER" enabled="no" hidden></o-text-input>

<div class="grid-container">
<div>
<div class="textMargi">
<label for="REQ_LNAME">{{'REQ_LNAME' | oTranslate}}</label>
<o-text-input [validators]="validatorsWithoutSpace" attr="name" required="yes"></o-text-input>
</div>
<div>
<div class="textMargi">
<label for="REQ_LHOLIDAY_DATE">{{'REQ_LHOLIDAY_DATE' | oTranslate}}</label>
<o-date-input #enddate attr="holiday_date" required="yes" format="DD/MM/YYYY">
</o-date-input>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<o-form #holidays_details confirm-exit="no" attr="holidays_new" service="holidays" entity="holidays" keys="id"
show-header="no" header-actions="R;I;U;D" show-header-navigation="no" (onInsert)="volver($event)">
<div class="grid-container">
<div>
<div class="textMargi">
<label for="REQ_LNAME">{{'REQ_LNAME' | oTranslate}}</label>
<o-text-input [validators]="validatorsWithoutSpace" attr="name" label-visible="false" required="yes"></o-text-input>
</div>
<div>
<div class="textMargi">
<label for="REQ_LHOLIDAY_DATE">{{'REQ_LHOLIDAY_DATE' | oTranslate}}</label>
<o-date-input attr="holiday_date" required="yes" format="DD/MM/YYYY">
</o-date-input>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<o-form #student_bootcamp_status_new attr="studentbootcamptstatusTable" service="studentbootcampstatus" entity="studentBootcampStatus" keys="id" show-header="no"
header-actions="R;I;U;D" show-header-navigation="no" (onInsert)="volver($event)" confirm-exit="no">
<div class="grid-container">
<div>
<div class="textMargi">
<label for="LSTUDENTBOOTCAMPSTATUS">{{'LSTUDENTBOOTCAMPSTATUS' | oTranslate}}</label>
<o-text-input label-visible="false" attr="student_bootcamp_status" required="yes" max-length="100"></o-text-input>
<o-slide-toggle attr="computable" label="{{'LSLIDETOGGLE_COMPUTABLE' | oTranslate}}" read-only="no" tooltip="{{'popUp_COMPUTABLE' | oTranslate}}"></o-slide-toggle>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<o-text-input attr="id" sql-type="INTEGER" enabled="no" hidden ></o-text-input>

<div class="grid-container">
<div>
<div class="textMargi">
<label for="LSTUDENTBOOTCAMPSTATUS">{{'LSTUDENTBOOTCAMPSTATUS' | oTranslate}}</label>
<o-text-input label-visible="false" attr="student_bootcamp_status" required="yes"></o-text-input>
<o-slide-toggle attr="computable" label="{{'LSLIDETOGGLE_COMPUTABLE' | oTranslate}}" read-only="no" tooltip="{{'popUp_COMPUTABLE' | oTranslate}}"></o-slide-toggle>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<o-text-input attr="id" sql-type="INTEGER" enabled="no" hidden></o-text-input>

<div class="grid-container">
<div>
<div class="textMargi">
<label for="REQ_LSTUDENTSTATUS">{{'REQ_LSTUDENTSTATUS' | oTranslate}}</label>
<o-text-input label-visible="false" attr="status" required="yes"></o-text-input>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<o-form #student_status_new attr="student_status_new" service="studentstatus" entity="studentStatus" keys="id" show-header="no"
header-actions="R;I;U;D" show-header-navigation="no" (onInsert)="volver($event)" confirm-exit="no">
<div class="grid-container">
<div>
<div class="textMargi">
<label for="REQ_LSTUDENTSTATUS">{{'REQ_LSTUDENTSTATUS' | oTranslate}}</label>
<o-text-input label-visible="false" attr="status" required="yes" max-length="40"></o-text-input>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<o-text-input attr="id" sql-type="INTEGER" enabled="no" hidden></o-text-input>

<div class="grid-container">
<div>
<div class="textMargi">
<label for="REQ_LTUTORTYPE">{{'REQ_LTUTORTYPE' | oTranslate}}</label>
<o-text-input label-visible="false" attr="type" required="yes"></o-text-input>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<o-form #tutor_type_new attr="tutor_type_new" confirm-exit="no" service="tutortype" entity="tutorType" keys="id" show-header="no"
header-actions="R;I;U;D" show-header-navigation="no" (onInsert)="volver($event)" confirm-exit="no">
<div class="grid-container">
<div>
<div class="textMargi">
<label for="REQ_LTUTORTYPE">{{'REQ_LTUTORTYPE' | oTranslate}}</label>
<o-text-input label-visible="false" attr="type" required="yes" max-length="100"></o-text-input>
</div>
Expand Down
Loading

0 comments on commit 4ded1fc

Please sign in to comment.