From 67c60735cbfcb6a5cf19b42673561eb961569087 Mon Sep 17 00:00:00 2001 From: Fabiane Souza Date: Thu, 1 Sep 2022 18:29:26 -0300 Subject: [PATCH 1/4] =?UTF-8?q?Feature=20segmentar=20usu=C3=A1rios=20por?= =?UTF-8?q?=20ag=C3=AAncia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GerenciamentoUsuarios.vue | 74 +++++++++++++------ 1 file changed, 53 insertions(+), 21 deletions(-) diff --git a/src/components/gerenciamento_usuarios/GerenciamentoUsuarios.vue b/src/components/gerenciamento_usuarios/GerenciamentoUsuarios.vue index d6f764a..0e5a524 100644 --- a/src/components/gerenciamento_usuarios/GerenciamentoUsuarios.vue +++ b/src/components/gerenciamento_usuarios/GerenciamentoUsuarios.vue @@ -1,25 +1,33 @@ \ No newline at end of file From a37a5e7221614c7d6e38859e8947c14931f37a8c Mon Sep 17 00:00:00 2001 From: Fabiane Souza Date: Tue, 20 Sep 2022 13:32:14 -0300 Subject: [PATCH 3/4] feat_segmentar_usuarios_por_agencia --- .../GerenciamentoUsuarios.vue | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/components/gerenciamento_usuarios/GerenciamentoUsuarios.vue b/src/components/gerenciamento_usuarios/GerenciamentoUsuarios.vue index 5ae505e..4f779c2 100644 --- a/src/components/gerenciamento_usuarios/GerenciamentoUsuarios.vue +++ b/src/components/gerenciamento_usuarios/GerenciamentoUsuarios.vue @@ -2,27 +2,27 @@
- Usuários Ativos - + Usuários Ativos +
{{adOpsTeam}}
 - + {{user.email}} ({{user.permission}}) toggle_on - Usuários Desativados - + Usuários Desativados +
{{adOpsTeam}}
 - + {{user.email}} ({{user.permission}}) toggle_off @@ -77,8 +77,8 @@ export default { adOpsTeams_deactivate: new Set(), allUsers: [], adOpsTeam: '', - users_activates: [], - users_deactivates: [], + usersActivates: [], + usersDeactivates: [], snackbar_message: '', position: 'center', showSnackbar: false @@ -101,10 +101,10 @@ export default { throw new Error(response.responseText || response.errorMessage); } const allUsers = JSON.parse(response.responseText).filter(user => user.email !== localStorage.getItem('email')); - this.users_activates = allUsers.filter(user => user.active == true); - this.users_deactivates = allUsers.filter(user => user.active == false); - this.users_activates.forEach(user => this.adOpsTeams_active.add(user.adOpsTeam)); - this.users_deactivates.forEach(user => this.adOpsTeams_deactivate.add(user.adOpsTeam)); + this.usersActivates = allUsers.filter(user => user.active == true); + this.usersDeactivates = allUsers.filter(user => user.active == false); + this.usersActivates.forEach(user => this.adOpsTeams_active.add(user.adOpsTeam)); + this.usersDeactivates.forEach(user => this.adOpsTeams_deactivate.add(user.adOpsTeam)); }).catch((err) => { this.apiError = true; this.apiErrorMessage = err.message; @@ -124,8 +124,8 @@ export default { resetAdOpsTeams(){ this.adOpsTeams_active.clear(); this.adOpsTeams_deactivate.clear(); - this.users_activates.forEach(user => this.adOpsTeams_active.add(user.adOpsTeam)); - this.users_deactivates.forEach(user => this.adOpsTeams_deactivate.add(user.adOpsTeam)); + this.usersActivates.forEach(user => this.adOpsTeams_active.add(user.adOpsTeam)); + this.usersDeactivates.forEach(user => this.adOpsTeams_deactivate.add(user.adOpsTeam)); }, gerenciaUsuario(id, opcao) { let url; @@ -165,8 +165,8 @@ export default { throw new Error(response.responseText || response.errorMessage); } const allUsers = JSON.parse(response.responseText).filter(user => user.email !== localStorage.getItem('email')); - this.users_activates = allUsers.filter(user => user.active == true); - this.users_deactivates = allUsers.filter(user => user.active == false); + this.usersActivates = allUsers.filter(user => user.active == true); + this.usersDeactivates = allUsers.filter(user => user.active == false); this.resetAdOpsTeams(); }).catch((err) => { this.showAuthAlert = this.isAuthError(this.statusCode); From 1f0e632c6fd56008374bfa2d715d999ff4d8d60b Mon Sep 17 00:00:00 2001 From: Fabiane Souza Date: Wed, 28 Sep 2022 19:13:46 -0300 Subject: [PATCH 4/4] =?UTF-8?q?Feature=20segmentar=20usu=C3=A1rios=20por?= =?UTF-8?q?=20ag=C3=AAncia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GerenciamentoUsuarios.vue | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/src/components/gerenciamento_usuarios/GerenciamentoUsuarios.vue b/src/components/gerenciamento_usuarios/GerenciamentoUsuarios.vue index 4f779c2..4bd6092 100644 --- a/src/components/gerenciamento_usuarios/GerenciamentoUsuarios.vue +++ b/src/components/gerenciamento_usuarios/GerenciamentoUsuarios.vue @@ -29,8 +29,10 @@ -
- +
+
+ +
@@ -39,7 +41,7 @@ {{ apiErrorMessage }}

- + {{ snackbar_message }} OK @@ -101,10 +103,17 @@ export default { throw new Error(response.responseText || response.errorMessage); } const allUsers = JSON.parse(response.responseText).filter(user => user.email !== localStorage.getItem('email')); - this.usersActivates = allUsers.filter(user => user.active == true); - this.usersDeactivates = allUsers.filter(user => user.active == false); - this.usersActivates.forEach(user => this.adOpsTeams_active.add(user.adOpsTeam)); - this.usersDeactivates.forEach(user => this.adOpsTeams_deactivate.add(user.adOpsTeam)); + allUsers.forEach(user => { + if(user.active === true) { + this.usersActivates.push(user); + this.adOpsTeams_active.add(user.adOpsTeam); + } else { + this.usersDeactivates.push(user); + this.adOpsTeams_deactivate.add(user.adOpsTeam); + } + }); + this.adOpsTeams_active.sort(); + console.log(this.adOpsTeams_active); }).catch((err) => { this.apiError = true; this.apiErrorMessage = err.message; @@ -186,8 +195,19 @@ export default { margin-left: 10px; } .load { - margin-top: 50px; - text-align: center; + position: fixed; + left:50%; + top:50%; + z-index:20; + } + .load_block { + background-color: rgba(0, 0, 0, 0.295); + position: fixed; + left:300px; + top:0px; + z-index:20; + width: 100%; + height: 100%; } .respostas { width: 100%;