- {{m.id}} |
{
this.close();
});
}
+ @Watch("newUser.username")
+ userChange(){
+
+ //Debounce
+ if(this.timeout)
+ clearTimeout(this.timeout);
+
+ this.timeout = setTimeout(() => {
+ if(this.mountedUsername.toLowerCase() == this.newUser.username.toLowerCase()){
+ this.usernameAllowed = true;
+ }
+ else{
+ if(this.Users.find(X=>X.username.toLowerCase() == this.newUser.username.toLowerCase())==null)
+ this.usernameAllowed = true;
+ else
+ this.usernameAllowed = false;
+ }
+ }, 300);
+
+ }
+
getColor(nome,cognome){
return getColorFromName(nome,cognome);
}
diff --git a/Step/wwwroot/src/modules/base-components/modal-create-user.vue b/Step/wwwroot/src/modules/base-components/modal-create-user.vue
index 06ed8a1d..4f6f4b73 100644
--- a/Step/wwwroot/src/modules/base-components/modal-create-user.vue
+++ b/Step/wwwroot/src/modules/base-components/modal-create-user.vue
@@ -1,21 +1,23 @@
-
+
-
+
+
+ {{'create_user_username_not_allowed' | localize("Username not allowed")}}
+
-
+
@@ -39,8 +41,8 @@
diff --git a/Step/wwwroot/src/modules/base-components/modal-password-user.ts b/Step/wwwroot/src/modules/base-components/modal-password-user.ts
new file mode 100644
index 00000000..d0d54d70
--- /dev/null
+++ b/Step/wwwroot/src/modules/base-components/modal-password-user.ts
@@ -0,0 +1,76 @@
+import Vue from "vue";
+import { Factory, MessageService,awaiter } from 'src/_base';
+import Component from "vue-class-component";
+import { ModalHelper, Modal } from "src/components/modals";
+import { getColorFromName,isDarkColor } from "src/_base/utils";
+import { usersService } from "src/services";
+import { Watch } from "vue-property-decorator";
+import { AppModel } from "src/store";
+
+@Component({
+ components: { modal: Modal },
+})
+export default class modalPasswordUser extends Vue {
+
+ newUser: any = {id:0,username:"",lastName:"",firstName:"",password:"",newPassword:""};
+ pswOk: boolean= false;
+ pswVisible:string="password";
+
+ get Users() {
+ return (this.$store.state as AppModel).users.users;
+ }
+
+ beforeMount() {
+ this.newUser = ModalHelper.userModal.currentUser;
+
+ Factory.Get(MessageService).subscribeToChannel("esc_pressed", args => {
+ this.close();
+ });
+ }
+
+
+ @Watch("newUser.password")
+ @Watch("newUser.newPassword")
+ userChange(){
+ this.pswOk = this.newUser.password == this.newUser.newPassword;
+ }
+
+ getColor(nome,cognome){
+ return getColorFromName(nome,cognome);
+ }
+ isDarkColor(color){
+ return isDarkColor(color);
+ }
+
+ beforeDestroy() {
+ Factory.Get(MessageService).deleteChannel("esc_pressed");
+ }
+
+ close() {
+ Factory.Get(MessageService).deleteChannel("esc_pressed");
+ ModalHelper.HideModal();
+ }
+
+ togglePswVisible() {
+ if(this.pswVisible=="text")
+ this.pswVisible="password";
+ else
+ this.pswVisible="text";
+ }
+
+ get isPswVisible() {
+ return this.pswVisible=="text";
+ }
+
+ async modify(user) {
+ alert("ToDo");
+ this.close();
+
+ //awaiter(usersService.editUser(user).then(response => {
+ // this.close();
+ //}));
+ }
+
+
+}
+
diff --git a/Step/wwwroot/src/modules/base-components/modal-password-user.vue b/Step/wwwroot/src/modules/base-components/modal-password-user.vue
new file mode 100644
index 00000000..3ead9bc3
--- /dev/null
+++ b/Step/wwwroot/src/modules/base-components/modal-password-user.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+ {{'create_user_psw_not_equals' | localize("Passwords must be the same")}}
+
+
+
+
diff --git a/Step/wwwroot/src/modules/base-components/modal-role-user.ts b/Step/wwwroot/src/modules/base-components/modal-role-user.ts
new file mode 100644
index 00000000..5c40b03f
--- /dev/null
+++ b/Step/wwwroot/src/modules/base-components/modal-role-user.ts
@@ -0,0 +1,68 @@
+import Vue from "vue";
+import { Factory, MessageService,awaiter } from 'src/_base';
+import Component from "vue-class-component";
+import { ModalHelper, Modal } from "src/components/modals";
+import { getColorFromName,isDarkColor } from "src/_base/utils";
+import { usersService } from "src/services";
+import { Watch } from "vue-property-decorator";
+import { AppModel } from "src/store";
+
+@Component({
+ components: { modal: Modal },
+})
+export default class modalRoleUser extends Vue {
+
+ newUser: any = {id:0,username:"",lastName:"",firstName:"",password:"",newPassword:""};
+ roles: any = [];
+ selectedRole: number = -1;
+
+
+ beforeMount() {
+ this.newUser = ModalHelper.userModal.currentUser;
+ this.selectedRole = this.newUser.role.id;
+
+ Factory.Get(MessageService).subscribeToChannel("esc_pressed", args => {
+ this.close();
+ });
+ }
+
+ async mounted(){
+ this.roles = await awaiter (usersService.getRoles());
+ }
+
+ ischecked(id){
+ return id==this.selectedRole;
+ }
+ select(id){
+ this.selectedRole = id;
+ }
+ get selectOk(){
+ return this.selectedRole>0;
+ }
+
+ getColor(nome,cognome){
+ return getColorFromName(nome,cognome);
+ }
+ isDarkColor(color){
+ return isDarkColor(color);
+ }
+
+ beforeDestroy() {
+ Factory.Get(MessageService).deleteChannel("esc_pressed");
+ }
+
+ close() {
+ Factory.Get(MessageService).deleteChannel("esc_pressed");
+ ModalHelper.HideModal();
+ }
+
+
+ async modify(user) {
+ awaiter(usersService.editRole(user,this.selectedRole).then(response => {
+ this.close();
+ }));
+ }
+
+
+}
+
diff --git a/Step/wwwroot/src/modules/base-components/modal-role-user.vue b/Step/wwwroot/src/modules/base-components/modal-role-user.vue
new file mode 100644
index 00000000..b85d559b
--- /dev/null
+++ b/Step/wwwroot/src/modules/base-components/modal-role-user.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
diff --git a/Step/wwwroot/src/services/dataService.ts b/Step/wwwroot/src/services/dataService.ts
index 54d14a27..ba10ff72 100644
--- a/Step/wwwroot/src/services/dataService.ts
+++ b/Step/wwwroot/src/services/dataService.ts
@@ -37,7 +37,7 @@ export class DataService extends baseRestService {
public async setActiveScreenOnHMI(screen) {
let result = await this.put("/api/nc/active_screen/"+ screen,null, true);
- if(typeof cmsClient != "undefined"){}
+ if(typeof cmsClient != "undefined")
cmsClient.forceNcFocus();
return result;
}
diff --git a/Step/wwwroot/src/services/hub.ts b/Step/wwwroot/src/services/hub.ts
index f1335cf9..0560a8dd 100644
--- a/Step/wwwroot/src/services/hub.ts
+++ b/Step/wwwroot/src/services/hub.ts
@@ -400,6 +400,11 @@ export class Hub {
public ncSoftKeyClick(id: number) {
this._hub.server.ncSoftKeyClick(id);
+
+ if(typeof cmsClient != "undefined"){
+ if(cmsClient.getNcWindowState() == 1)
+ cmsClient.forceNcFocus();
+ }
}
public headOverrideMinus(id: number) {
diff --git a/Step/wwwroot/src/services/loginService.ts b/Step/wwwroot/src/services/loginService.ts
index 492a489c..d31139ba 100644
--- a/Step/wwwroot/src/services/loginService.ts
+++ b/Step/wwwroot/src/services/loginService.ts
@@ -32,7 +32,6 @@ export class LoginService extends baseRestService {
async getAllUsers(): Promise {
let result = await this.Get("api/user/list",true);
- console.log(result);
return result;
}
diff --git a/Step/wwwroot/src/services/usersService.ts b/Step/wwwroot/src/services/usersService.ts
index e195d529..5f53ac50 100644
--- a/Step/wwwroot/src/services/usersService.ts
+++ b/Step/wwwroot/src/services/usersService.ts
@@ -2,6 +2,7 @@ import { baseRestService } from "src/_base/baseRestService";
import { usersActions } from "../store/users.store";
import Factory from "src/_base/factoryService";
import { store, AppModel } from "../store";
+import { LoginService } from "src/app.modules";
export class UsersService extends baseRestService {
@@ -11,6 +12,11 @@ export class UsersService extends baseRestService {
return result;
}
+ async getRoles(): Promise {
+ let result = await this.Get("api/user/manager/role/list",true);
+ return result;
+ }
+
async createUser(model: any){
var result = await this.Post("api/user/manager/user/", model,true);
usersActions.updateUser(store, result);
@@ -20,8 +26,32 @@ export class UsersService extends baseRestService {
async editUser(model: any){
var result = await this.Put("api/user/manager/user/" + model.id , model,true);
usersActions.updateUser(store, result);
+
+ //if is logged update info
+ if((store.state as AppModel).currentUser.id == model.id){
+ await Factory.Get(LoginService).getUserInfo();
+ }
return result;
}
+
+ async deleteUser(model: any){
+ var result = await this.Delete("api/user/manager/user/" + model.id ,true);
+ usersActions.deleteUser(store, model.id);
+ return result;
+ }
+
+ async editRole(model: any,roleId:number){
+ var result = await this.Put("api/user/manager/user/" + model.id +"/role/" + roleId , null,true);
+ usersActions.updateUser(store, result);
+
+ //if is logged update info
+ if((store.state as AppModel).currentUser.id == model.id){
+ await Factory.Get(LoginService).getUserInfo();
+ }
+ return result;
+ }
+
+
}
Factory.Register(UsersService);
diff --git a/Step/wwwroot/src/store/users.store.ts b/Step/wwwroot/src/store/users.store.ts
index ace19bfd..95d5ad3e 100644
--- a/Step/wwwroot/src/store/users.store.ts
+++ b/Step/wwwroot/src/store/users.store.ts
@@ -5,6 +5,7 @@ export interface UsersStoreModel {
export interface UsersActions {
updateUsers(context, model:server.userModel[]);
updateUser(context, model:server.userModel);
+ deleteUser(context, id:number);
}
export const usersStore = {
@@ -30,6 +31,10 @@ export interface UsersStoreModel {
updateUser(store, model:server.userModel) {
store._users.set(model.id, model);
store.users = Array.from(store._users.values());
+ },
+ deleteUser(store, id:number) {
+ store._users.delete(id)
+ store.users = Array.from(store._users.values());
}
},
actions: {
@@ -38,6 +43,9 @@ export interface UsersStoreModel {
},
updateUser(context, model:server.userModel) {
context.commit("updateUser", model);
+ },
+ deleteUser(context, id:number) {
+ context.commit("deleteUser", id);
}
}as UsersActions
}
|