diff --git a/ogWebconsole/src/app/app.module.ts b/ogWebconsole/src/app/app.module.ts
index 6165226..db3797b 100644
--- a/ogWebconsole/src/app/app.module.ts
+++ b/ogWebconsole/src/app/app.module.ts
@@ -90,6 +90,10 @@ import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatNativeDateModule } from '@angular/material/core';
import { CommandsGroupsComponent } from './components/commands/commands-groups/commands-groups.component';
import { CommandsTaskComponent } from './components/commands/commands-task/commands-task.component';
+import { CreateCommandGroupComponent } from './components/commands/commands-groups/create-command-group/create-command-group.component';
+import { DetailCommandGroupComponent } from './components/commands/commands-groups/detail-command-group/detail-command-group.component';
+import { CreateTaskComponent } from './components/commands/commands-task/create-task/create-task.component';
+import { DetailTaskComponent } from './components/commands/commands-task/detail-task/detail-task.component';
@NgModule({
declarations: [
AppComponent,
@@ -136,7 +140,11 @@ import { CommandsTaskComponent } from './components/commands/commands-task/comma
CommandDetailComponent,
CreateCommandComponent,
CommandsGroupsComponent,
- CommandsTaskComponent
+ CommandsTaskComponent,
+ CreateCommandGroupComponent,
+ DetailCommandGroupComponent,
+ CreateTaskComponent,
+ DetailTaskComponent
],
bootstrap: [AppComponent],
imports: [BrowserModule,
diff --git a/ogWebconsole/src/app/components/commands/commands-groups/commands-groups.component.css b/ogWebconsole/src/app/components/commands/commands-groups/commands-groups.component.css
index e69de29..9416d5a 100644
--- a/ogWebconsole/src/app/components/commands/commands-groups/commands-groups.component.css
+++ b/ogWebconsole/src/app/components/commands/commands-groups/commands-groups.component.css
@@ -0,0 +1,66 @@
+.commands-list {
+ margin-bottom: 20px;
+ }
+
+ .command-item {
+ cursor: pointer;
+ margin-bottom: 10px;
+ padding: 10px;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ background-color: #f9f9f9;
+ }
+
+ .command-item:hover {
+ background-color: #e9e9e9;
+ }
+
+ .command-details {
+ padding: 20px;
+ border: 1px solid #ddd;
+ background-color: #f4f4f4;
+ border-radius: 4px;
+ }
+
+ .script-display {
+ margin-top: 20px;
+ background-color: #000;
+ color: #fff;
+ padding: 10px;
+ border-radius: 4px;
+ }
+
+ pre {
+ margin: 0;
+ font-family: 'Courier New', Courier, monospace;
+ }
+
+ .mat-elevation-z8{
+ margin-top: 20px;
+ }
+ tr:hover {
+ background-color: rgba(219, 219, 219, 0.219);
+ }
+
+ .detailBtn{
+ cursor: pointer;
+ }
+
+ .search-container {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
+ padding: 0 5px;
+ box-sizing: border-box;
+ }
+
+ .search-string {
+ flex: 2;
+ padding: 5px;
+ }
+
+ .search-boolean {
+ flex: 1;
+ padding: 5px;
+ }
\ No newline at end of file
diff --git a/ogWebconsole/src/app/components/commands/commands-groups/commands-groups.component.html b/ogWebconsole/src/app/components/commands/commands-groups/commands-groups.component.html
index aba3a48..699c4ea 100644
--- a/ogWebconsole/src/app/components/commands/commands-groups/commands-groups.component.html
+++ b/ogWebconsole/src/app/components/commands/commands-groups/commands-groups.component.html
@@ -1 +1,72 @@
-commands-groups works!
+
+
+
+
+ Buscar nombre de grupo
+
+ search
+ Pulsar 'enter' para buscar
+
+
+
+
+
+
+ | Nombre del grupo |
+ {{ group.name }} |
+
+
+
+
+ Creado por |
+ {{ group.createdBy }} |
+
+
+
+
+ Fecha de creación |
+ {{ group.createdAt | date:'short' }} |
+
+
+
+
+ Acciones |
+
+
+
+
+
+
+
+ |
+
+
+ |
+ |
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ogWebconsole/src/app/components/commands/commands-groups/commands-groups.component.ts b/ogWebconsole/src/app/components/commands/commands-groups/commands-groups.component.ts
index 8729d11..e5fd3c5 100644
--- a/ogWebconsole/src/app/components/commands/commands-groups/commands-groups.component.ts
+++ b/ogWebconsole/src/app/components/commands/commands-groups/commands-groups.component.ts
@@ -1,10 +1,87 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { MatDialog } from '@angular/material/dialog';
+import { ToastrService } from 'ngx-toastr';
+import { CreateCommandGroupComponent } from './create-command-group/create-command-group.component'
+import { DetailCommandGroupComponent } from './detail-command-group/detail-command-group.component';
+import { DeleteModalComponent } from '../../../shared/delete_modal/delete-modal/delete-modal.component';
@Component({
selector: 'app-commands-groups',
templateUrl: './commands-groups.component.html',
- styleUrl: './commands-groups.component.css'
+ styleUrls: ['./commands-groups.component.css']
})
-export class CommandsGroupsComponent {
+export class CommandsGroupsComponent implements OnInit {
+ baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+ commandGroups: any[] = [];
+ filters: { [key: string]: string | boolean } = {};
+ length: number = 0;
+ itemsPerPage: number = 10;
+ page: number = 1;
+ pageSizeOptions: number[] = [5, 10, 20, 40, 100];
+ displayedColumns: string[] = ['name', 'createdBy', 'createdAt', 'actions'];
+ private apiUrl = `${this.baseUrl}/command-groups`;
+ constructor(private http: HttpClient, private dialog: MatDialog, private toastService: ToastrService) {}
+
+ ngOnInit(): void {
+ this.search();
+ }
+
+ search(): void {
+ this.http.get(`${this.apiUrl}?page=${this.page}&itemsPerPage=${this.itemsPerPage}`, { params: this.filters }).subscribe(
+ (data) => {
+ this.commandGroups = data['hydra:member'];
+ this.length = data['hydra:totalItems'];
+ },
+ (error) => {
+ console.error('Error fetching command groups', error);
+ }
+ );
+ }
+
+ viewGroupDetails(group: any): void {
+ this.dialog.open(DetailCommandGroupComponent, {
+ width: '800px',
+ data: group,
+ }).afterClosed().subscribe(() => this.search());
+ }
+
+ openCreateCommandGroupModal(): void {
+ this.dialog.open(CreateCommandGroupComponent, {
+ width: '600px',
+ }).afterClosed().subscribe(() => this.search());
+ }
+
+ editCommandGroup(group: any): void {
+ this.dialog.open(CreateCommandGroupComponent, {
+ width: '600px',
+ data: { group },
+ }).afterClosed().subscribe(() => this.search());
+ }
+
+ deleteCommandGroup(group: any): void {
+ this.dialog.open(DeleteModalComponent, {
+ width: '300px',
+ data: { name: group.name },
+ }).afterClosed().subscribe((result) => {
+ if (result) {
+ this.http.delete(`${this.apiUrl}/${group.uuid}`).subscribe({
+ next: () => {
+ this.toastService.success('Grupo de comandos eliminado con éxito');
+ this.search();
+ },
+ error: (error) => {
+ console.error('Error al eliminar el grupo de comandos:', error);
+ }
+ });
+ }
+ });
+ }
+
+ onPageChange(event: any): void {
+ this.page = event.pageIndex;
+ this.itemsPerPage = event.pageSize;
+ this.search();
+ }
}
diff --git a/ogWebconsole/src/app/components/commands/commands-groups/create-command-group/create-command-group.component.css b/ogWebconsole/src/app/components/commands/commands-groups/create-command-group/create-command-group.component.css
new file mode 100644
index 0000000..1b1578d
--- /dev/null
+++ b/ogWebconsole/src/app/components/commands/commands-groups/create-command-group/create-command-group.component.css
@@ -0,0 +1,58 @@
+.create-command-group-container {
+ padding: 20px;
+ }
+
+ .command-group-form {
+ display: flex;
+ flex-direction: column;
+ }
+
+ .command-selection {
+ display: flex;
+ justify-content: space-between;
+ margin: 20px 0;
+ }
+
+ .available-commands, .selected-commands {
+ width: 48%;
+ }
+
+ .selected-commands-list {
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ padding: 10px;
+ background-color: #f9f9f9;
+ }
+
+ .commands-container {
+ display: flex;
+ flex-direction: column;
+ }
+
+ .command-item {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 8px;
+ background-color: #fff;
+ border-radius: 4px;
+ margin-bottom: 8px;
+ box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+ }
+
+ .remove-icon {
+ cursor: pointer;
+ color: #f44336; /* Rojo para eliminar */
+ }
+
+ .chevron-icon {
+ margin: 0 10px;
+ color: #666;
+ }
+
+ .command-group-actions {
+ margin-top: 20px;
+ display: flex;
+ justify-content: space-between;
+ }
+
\ No newline at end of file
diff --git a/ogWebconsole/src/app/components/commands/commands-groups/create-command-group/create-command-group.component.html b/ogWebconsole/src/app/components/commands/commands-groups/create-command-group/create-command-group.component.html
new file mode 100644
index 0000000..11142fc
--- /dev/null
+++ b/ogWebconsole/src/app/components/commands/commands-groups/create-command-group/create-command-group.component.html
@@ -0,0 +1,63 @@
+
+
Crear Grupo de Comandos
+
+
+
+
Detalles del Grupo de Comandos
+
+
+
+ {{ data.name }}
+ Creado por: {{ data.createdBy }}
+
+
+
+ ID del Grupo: {{ data.uuid }}
+ Posición: {{ data.position }}
+ Fecha de Creación: {{ data.createdAt | date:'short' }}
+
+ Comandos Incluidos:
+
+
+ | Nombre |
+ {{ command.name }} |
+
+
+
+ UUID |
+ {{ command.uuid }} |
+
+
+ |
+ |
+
+
+
+
+
+
+
+
commands-task works!
+
+
+
+
+
+ | Nombre |
+ {{ task.name }} |
+
+
+
+
+ Grupo de Comandos |
+ {{ task.commandGroup.name }} |
+
+
+
+
+ Fecha de Ejecución |
+ {{ task.scheduledDate | date:'short' }} |
+
+
+
+
+ Estado |
+ {{ task.enabled ? 'Habilitado' : 'Deshabilitado' }} |
+
+
+
+
+ Acciones |
+
+
+
+
+
+
+
+ |
+
+
+ |
+ |
+
+
+
+
+
\ No newline at end of file
diff --git a/ogWebconsole/src/app/components/commands/commands-task/commands-task.component.ts b/ogWebconsole/src/app/components/commands/commands-task/commands-task.component.ts
index 15cf5ff..95d6ab7 100644
--- a/ogWebconsole/src/app/components/commands/commands-task/commands-task.component.ts
+++ b/ogWebconsole/src/app/components/commands/commands-task/commands-task.component.ts
@@ -1,10 +1,87 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { MatDialog } from '@angular/material/dialog';
+import { ToastrService } from 'ngx-toastr';
+import { CreateTaskComponent } from './create-task/create-task.component';
+import { DetailTaskComponent } from './detail-task/detail-task.component';
+import { DeleteModalComponent } from '../../../shared/delete_modal/delete-modal/delete-modal.component';
@Component({
selector: 'app-commands-task',
templateUrl: './commands-task.component.html',
- styleUrl: './commands-task.component.css'
+ styleUrls: ['./commands-task.component.css']
})
-export class CommandsTaskComponent {
+export class CommandsTaskComponent implements OnInit {
+ baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+ tasks: any[] = [];
+ filters: { [key: string]: string | boolean } = {};
+ length: number = 0;
+ itemsPerPage: number = 10;
+ page: number = 1;
+ pageSizeOptions: number[] = [5, 10, 20, 40, 100];
+ displayedColumns: string[] = ['name', 'commandGroup', 'scheduledDate', 'enabled', 'actions'];
+ private apiUrl = `${this.baseUrl}/tasks`;
+ constructor(private http: HttpClient, private dialog: MatDialog, private toastService: ToastrService) {}
+
+ ngOnInit(): void {
+ this.loadTasks();
+ }
+
+ loadTasks(): void {
+ this.http.get(`${this.apiUrl}?page=${this.page}&itemsPerPage=${this.itemsPerPage}`, { params: this.filters }).subscribe(
+ (data) => {
+ this.tasks = data['hydra:member'];
+ this.length = data['hydra:totalItems'];
+ },
+ (error) => {
+ console.error('Error fetching tasks', error);
+ }
+ );
+ }
+
+ viewTaskDetails(task: any): void {
+ this.dialog.open(DetailTaskComponent, {
+ width: '800px',
+ data: task,
+ }).afterClosed().subscribe(() => this.loadTasks());
+ }
+
+ openCreateTaskModal(): void {
+ this.dialog.open(CreateTaskComponent, {
+ width: '600px',
+ }).afterClosed().subscribe(() => this.loadTasks());
+ }
+
+ editTask(task: any): void {
+ this.dialog.open(CreateTaskComponent, {
+ width: '600px',
+ data: { task },
+ }).afterClosed().subscribe(() => this.loadTasks());
+ }
+
+ deleteTask(task: any): void {
+ this.dialog.open(DeleteModalComponent, {
+ width: '300px',
+ data: { name: task.name },
+ }).afterClosed().subscribe((result) => {
+ if (result) {
+ this.http.delete(`${this.apiUrl}/${task.uuid}`).subscribe({
+ next: () => {
+ this.toastService.success('Tarea eliminada con éxito');
+ this.loadTasks();
+ },
+ error: (error) => {
+ console.error('Error al eliminar la tarea:', error);
+ }
+ });
+ }
+ });
+ }
+
+ onPageChange(event: any): void {
+ this.page = event.pageIndex;
+ this.itemsPerPage = event.pageSize;
+ this.loadTasks();
+ }
}
diff --git a/ogWebconsole/src/app/components/commands/commands-task/create-task/create-task.component.css b/ogWebconsole/src/app/components/commands/commands-task/create-task/create-task.component.css
new file mode 100644
index 0000000..c1ecdce
--- /dev/null
+++ b/ogWebconsole/src/app/components/commands/commands-task/create-task/create-task.component.css
@@ -0,0 +1,25 @@
+.full-width {
+ width: 100%;
+ }
+
+ .commands-list {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ padding: 10px;
+ border: 1px solid #ccc;
+ background-color: #f9f9f9;
+ border-radius: 4px;
+ }
+
+ .command-item {
+ padding: 10px;
+ background-color: #f4f4f4;
+ margin-bottom: 10px;
+ border: 1px solid #ddd;
+ border-radius: 4px;
+ }
+
+ .command-item:hover {
+ background-color: #e9e9e9;
+ }
+
\ No newline at end of file
diff --git a/ogWebconsole/src/app/components/commands/commands-task/create-task/create-task.component.html b/ogWebconsole/src/app/components/commands/commands-task/create-task/create-task.component.html
new file mode 100644
index 0000000..467f882
--- /dev/null
+++ b/ogWebconsole/src/app/components/commands/commands-task/create-task/create-task.component.html
@@ -0,0 +1,44 @@
+Crear Tarea
+
+
+
+ Selecciona un Grupo de Comandos
+
+
+ {{ group.name }}
+
+
+ Este campo es obligatorio
+
+
+
+
Comandos del Grupo Seleccionado
+
+ {{ command.name }}
+
+
detail-task works!
diff --git a/ogWebconsole/src/app/components/commands/commands-task/detail-task/detail-task.component.spec.ts b/ogWebconsole/src/app/components/commands/commands-task/detail-task/detail-task.component.spec.ts
new file mode 100644
index 0000000..7fa5c15
--- /dev/null
+++ b/ogWebconsole/src/app/components/commands/commands-task/detail-task/detail-task.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DetailTaskComponent } from './detail-task.component';
+
+describe('DetailTaskComponent', () => {
+ let component: DetailTaskComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [DetailTaskComponent]
+ })
+ .compileComponents();
+
+ fixture = TestBed.createComponent(DetailTaskComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ogWebconsole/src/app/components/commands/commands-task/detail-task/detail-task.component.ts b/ogWebconsole/src/app/components/commands/commands-task/detail-task/detail-task.component.ts
new file mode 100644
index 0000000..ca6401d
--- /dev/null
+++ b/ogWebconsole/src/app/components/commands/commands-task/detail-task/detail-task.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'app-detail-task',
+ templateUrl: './detail-task.component.html',
+ styleUrl: './detail-task.component.css'
+})
+export class DetailTaskComponent {
+
+}
diff --git a/ogWebconsole/src/app/components/commands/main-commands/commands.component.css b/ogWebconsole/src/app/components/commands/main-commands/commands.component.css
index c98fd38..fffd686 100644
--- a/ogWebconsole/src/app/components/commands/main-commands/commands.component.css
+++ b/ogWebconsole/src/app/components/commands/main-commands/commands.component.css
@@ -44,4 +44,23 @@ tr:hover {
.detailBtn{
cursor: pointer;
+}
+
+.search-container {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
+ padding: 0 5px;
+ box-sizing: border-box;
+}
+
+.search-string {
+ flex: 2;
+ padding: 5px;
+}
+
+.search-boolean {
+ flex: 1;
+ padding: 5px;
}
\ No newline at end of file
diff --git a/ogWebconsole/src/app/components/commands/main-commands/commands.component.html b/ogWebconsole/src/app/components/commands/main-commands/commands.component.html
index f974425..b99a3b0 100644
--- a/ogWebconsole/src/app/components/commands/main-commands/commands.component.html
+++ b/ogWebconsole/src/app/components/commands/main-commands/commands.component.html
@@ -1,9 +1,18 @@