0; else noResults">
diff --git a/ogWebconsole/src/app/components/groups/groups.component.ts b/ogWebconsole/src/app/components/groups/groups.component.ts
index 862dc17..a47fde3 100644
--- a/ogWebconsole/src/app/components/groups/groups.component.ts
+++ b/ogWebconsole/src/app/components/groups/groups.component.ts
@@ -39,6 +39,12 @@ export class GroupsComponent implements OnInit {
searchTerm: string = '';
selectedFilter1: string = 'none';
selectedFilter2: string = 'none';
+
+ selectedFilterOS: string[] = [];
+ selectedFilterStatus: string[] = [];
+ filterIP: string = '';
+ filterMAC: string = '';
+
filterName: string = '';
filteredResults: any[] = [];
savedFilterNames: any[] = [];
@@ -329,7 +335,12 @@ export class GroupsComponent implements OnInit {
filters: {
filter0: this.filterName,
filter1: this.selectedFilter1,
- filter2: this.selectedFilter2
+ filter2: this.selectedFilter2,
+ filter3: this.selectedFilterOS,
+ filter4: this.selectedFilterStatus,
+ filter5: this.filterIP,
+ filter6: this.filterMAC,
+
}
};
@@ -355,6 +366,12 @@ export class GroupsComponent implements OnInit {
this.filterName = response.filters.filter0 || '';
this.selectedFilter1 = response.filters.filter1 || null;
this.selectedFilter2 = response.filters.filter2 || '';
+
+ this.selectedFilterOS = response.filters.filter3 || [];
+ this.selectedFilterStatus = response.filters.filter4 || [];
+ this.filterIP = response.filters.filter5 || '';
+ this.filterMAC = response.filters.filter6 || '';
+
this.applyFilter();
}
}, error => {
diff --git a/ogWebconsole/src/app/components/layout/header/header.component.ts b/ogWebconsole/src/app/components/layout/header/header.component.ts
index 668e03e..97d0c99 100644
--- a/ogWebconsole/src/app/components/layout/header/header.component.ts
+++ b/ogWebconsole/src/app/components/layout/header/header.component.ts
@@ -50,4 +50,5 @@ export class HeaderComponent implements OnInit {
console.log("User edited successfully!")
}); */
}
+
}
diff --git a/ogWebconsole/src/locale/messages.en.json b/ogWebconsole/src/locale/messages.en.json
index 69f2491..661fa67 100644
--- a/ogWebconsole/src/locale/messages.en.json
+++ b/ogWebconsole/src/locale/messages.en.json
@@ -1,19 +1,20 @@
{
"locale": "en",
"translations": {
- "digital-board": "Digital board",
- "projector-alt": "Projector",
- "client-image-alt": "Client",
- "save-disposition-button": "Save layout",
- "client-properties-title": "Client Properties",
- "property-header": "Property",
- "value-header": "Value",
+ "actions-modal-title": "Actions",
"power-on-button": "Power On",
"power-off-button": "Power Off",
"reset-button": "Reset",
- "other-actions-1": "Other actions 1",
- "other-actions-2": "Other actions 2",
- "other-actions-3": "Other actions 3",
+ "other-actions-1": "Other Actions 1",
+ "other-actions-2": "Other Actions 2",
+ "other-actions-3": "Other Actions 3",
+ "digital-board": "Digital Board",
+ "projector-alt": "Projector",
+ "client-image-alt": "Client",
+ "save-disposition-button": "Save Disposition",
+ "client-properties-title": "Client Properties",
+ "property-header": "Property",
+ "value-header": "Value",
"close-button": "Close",
"add-client-dialog-title": "Add Client",
"organizational-unit-label": "Parent",
@@ -35,9 +36,9 @@
"add-button": "Add",
"edit-client-dialog-title": "Edit Client",
"delete-dialog-title": "Delete",
- "delete-dialog-content": "Do you want to delete the clients located in {$INTERPOLATION} or move them to the top level?",
+ "delete-dialog-content": "Do you want to delete the clients located in {$INTERPOLATION} or do you want to relocate them to the higher level?",
"delete-all-clients-button": "Delete all clients",
- "reposition-clients-button": "Reposition",
+ "reposition-clients-button": "Relocate",
"deleteDialogTitle": "Delete",
"deleteConfirmationMessage": "Are you sure you want to delete {$INTERPOLATION}?",
"cancelButton": "Cancel",
@@ -46,20 +47,20 @@
"newOrganizationalUnitButton": "New Organizational Unit",
"newClientButton": "New Client",
"legendButton": "Legend",
- "classroomMapButton": "Classroom Layout",
+ "classroomMapButton": "Classroom Map",
"searchLabel": "Search",
"searchPlaceholder": "Search",
"searchHint": "Press 'enter' to search among organizational units",
"organizationalUnitTitle": "Organizational Unit",
- "viewTreeTooltip": "account_tree",
- "viewTreeMenu": "View Organization Chart",
- "editUnitTooltip": "edit",
+ "viewTreeTooltip": "account_tree ",
+ "viewTreeMenu": "View Organizational Chart",
+ "editUnitTooltip": "edit ",
"editUnitMenu": "Edit",
- "viewUnitTool": "visibility",
- "viewUnitMenu": "View Details",
- "addInternalUnitTool": "add_home_work",
+ "viewUnitTool": "visibility ",
+ "viewUnitMenu": "View Data",
+ "addInternalUnitTool": "add_home_work ",
"addInternalUnitMenu": "Add Organizational Unit",
- "addClientDevice": "devices",
+ "addClientDevice": "devices ",
"addClientMenu": "Create Client",
"internalElementsTitle": "Internal Elements",
"noInternalElementsMessage": "No internal elements",
@@ -70,9 +71,10 @@
"addClientTooltip": "devices",
"deleteElementTooltip": "delete",
"deleteElementMenu": "Delete Element",
+ "7122753603772512402": "Advanced Search",
"searchTitle": "Search",
- "selectFilterLabel": "Select filter",
- "selectOptionLabel": "Select an option",
+ "selectFilterLabel": "Select Filter",
+ "selectOptionLabel": "Select an Option",
"organizationalUnitsOption": "Organizational Units",
"clientsOption": "Clients",
"nameLabel": "Name",
@@ -82,13 +84,25 @@
"classroomsGroupOption": "Classroom Groups",
"classroomOption": "Classrooms",
"clientGroupOption": "Client Groups",
- "selectAnotherOptionLabel": "Select another option",
+ "floorLabel": "Floor",
"noneOption": "None",
- "option1": "Option 1",
- "option2": "Option 2",
- "option3": "Option 3",
+ "option1": "Floor 1",
+ "option2": "Floor 2",
+ "option3": "Floor 3",
+ "selectAnotherOptionLabel": "Operating System",
+ "selectStateLabel": "State",
+ "offOption": "off",
+ "initializingOption": "initializing",
+ "ogliveOption": "oglive",
+ "busyOption": "busy",
+ "linuxOption": "linux",
+ "linuxSessionOption": "linux_session",
+ "macosOption": "macos",
+ "windowsOption": "windows",
+ "windowsSessionOption": "windows_session",
"saveFiltersButton": "Save Filters",
- "internalUnits": "Internal Units: {$INTERPOLATION}",
+ "sendFiltersButton": "Send Action",
+ "internalUnits": "Internal units: {$INTERPOLATION}",
"clients": "Clients: {$INTERPOLATION}",
"noResultsMessage": "No results to display.",
"orgUnitTitle": "Organizational Unit",
@@ -137,12 +151,12 @@
"2366056895545879062": "Power On",
"7368908909686115507": "Power Off",
"7760171369336053154": "Reset",
- "6799187990933478083": "Other actions 1",
- "8971534271481971645": "Other actions 2",
- "3300614831699539964": "Other actions 3",
+ "6799187990933478083": "Other Actions 1",
+ "8971534271481971645": "Other Actions 2",
+ "3300614831699539964": "Other Actions 3",
"viewTreeTitle": "View Organizational Unit Tree",
"closeButton": "Close",
- "webConsoleTitle": "Opengnsys Web Console",
+ "webConsoleTitle": "Opengnsys Webconsole",
"admin": "Administration",
"editUser": "Edit User",
"usersMenuItem": "Users",
@@ -160,18 +174,18 @@
"headerOpengnsys": "Opengnsys",
"loginlabelUsername": "Enter your username",
"loginlabelPassword": "Enter your password",
- "buttonLogin": "Log In",
+ "buttonLogin": "Login",
"labelUsers": "Users",
"labelRoles": "Roles",
"dialogTitleAddRole": "Add Role (TBD)",
"labelRoleName": "Name",
"sectionTitlePermissions": "Permissions:",
- "checkboxManageUsers": "Manage users",
+ "checkboxManageUsers": "Manage Users",
"checkboxPXEConfig": "PXE Configuration",
"checkboxConsoleImages": "Web Console Images",
- "checkboxManageComponents": "Manage various components",
- "checkboxCreateImages": "Create images",
- "checkboxServerConfigScript": "Server configuration script",
+ "checkboxManageComponents": "Manage Different Components",
+ "checkboxCreateImages": "Create Images",
+ "checkboxServerConfigScript": "Server Configuration Script",
"checkboxOther": "...",
"buttonCancel": "Cancel",
"buttonAdd": "Add",
@@ -190,8 +204,8 @@
"labelCurrentPassword": "Current Password",
"labelNewPassword": "New Password",
"labelRepeatPassword": "Repeat Password",
- "errorPasswordMismatch": "Passwords do not match",
- "errorUpdate": "{$INTERPOLATION}",
+ "errorPasswordMismatch": " Passwords do not match ",
+ "errorUpdate": " {$INTERPOLATION} ",
"buttonEdit": "Edit",
"dialogTitleDeleteUser": "Delete User",
"dialogContentDeleteUser": "Are you sure you want to delete {$INTERPOLATION}?",
diff --git a/ogWebconsole/src/locale/messages.es.json b/ogWebconsole/src/locale/messages.es.json
index 5665acb..f6c6d0c 100644
--- a/ogWebconsole/src/locale/messages.es.json
+++ b/ogWebconsole/src/locale/messages.es.json
@@ -1,6 +1,13 @@
{
"locale": "es",
"translations": {
+ "actions-modal-title": "Acciones",
+ "power-on-button": "Encender",
+ "power-off-button": "Apagar",
+ "reset-button": "Resetear",
+ "other-actions-1": "Otras acciones 1",
+ "other-actions-2": "Otras acciones 2",
+ "other-actions-3": "Otras acciones 3",
"digital-board": "Pizarra digital",
"projector-alt": "Proyector",
"client-image-alt": "Client",
@@ -8,12 +15,6 @@
"client-properties-title": "Propiedades cliente",
"property-header": "Propiedad",
"value-header": "Valor",
- "power-on-button": "Encender",
- "power-off-button": "Apagar",
- "reset-button": "Resetear",
- "other-actions-1": "Otras acciones 1",
- "other-actions-2": "Otras acciones 2",
- "other-actions-3": "Otras acciones 3",
"close-button": "Cerrar",
"add-client-dialog-title": "Añadir Cliente",
"organizational-unit-label": "Padre",
@@ -70,6 +71,7 @@
"addClientTooltip": "devices",
"deleteElementTooltip": "delete",
"deleteElementMenu": "Borrar elemento",
+ "7122753603772512402": "Búsqueda avanzada",
"searchTitle": "Búsqueda",
"selectFilterLabel": "Seleccione filtro",
"selectOptionLabel": "Selecciona una opción",
@@ -82,12 +84,24 @@
"classroomsGroupOption": "Grupos de aulas",
"classroomOption": "Aulas",
"clientGroupOption": "Grupos de clientes",
- "selectAnotherOptionLabel": "Selecciona otra opción",
+ "floorLabel": "Planta",
"noneOption": "Ninguno",
- "option1": "Opción 1",
- "option2": "Opción 2",
- "option3": "Opción 3",
+ "option1": "Planta 1",
+ "option2": "Planta 2",
+ "option3": "Planta 3",
+ "selectAnotherOptionLabel": "Sistema Operativo",
+ "selectStateLabel": "Estado",
+ "offOption": "off",
+ "initializingOption": "initializing",
+ "ogliveOption": "oglive",
+ "busyOption": "busy",
+ "linuxOption": "linux",
+ "linuxSessionOption": "linux_session",
+ "macosOption": "macos",
+ "windowsOption": "windows",
+ "windowsSessionOption": "windows_session",
"saveFiltersButton": "Guardar Filtros",
+ "sendFiltersButton": "Enviar Acción",
"internalUnits": "Unidades internas: {$INTERPOLATION}",
"clients": "Clientes: {$INTERPOLATION}",
"noResultsMessage": "No hay resultados para mostrar.",