fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMCORE-2623 Required fields are not been highlighted in the new user UI

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2021-01-04 09:16:17 -04:00
parent 457ab8817b
commit 8b2d6cfd1e
7 changed files with 336 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/userPersonalInformation/public/index.html
View File

@@ -11,6 +11,8 @@
<script type="text/javascript" src="/js/ext/translation.en.js"></script>
<script type="text/javascript">
var USR_UID='';
var canEdit=true;
var modeOfForm=1;
</script>
</head>
<body>

424
workflow/engine/methods/userPersonalInformation/src/components/personalInformation.vue
View File

@@ -8,8 +8,10 @@
<b-form-group :label="$root.translation('ID_FIRSTNAME')+' (*)'">
<b-form-input v-model="form.USR_FIRSTNAME"
autocomplete="off"
:state="validateState('USR_FIRSTNAME')"></b-form-input>
<b-form-invalid-feedback>{{$root.translation('ID_IS_REQUIRED')}}</b-form-invalid-feedback>
:state="validate.USR_FIRSTNAME.state"
@keyup="validateFirstName"
:disabled="disabled"></b-form-input>
<b-form-invalid-feedback>{{validate.USR_FIRSTNAME.message}}</b-form-invalid-feedback>
</b-form-group>
</b-col>
<b-col cols="2">
@@ -18,18 +20,23 @@
<b-form-group :label="$root.translation('ID_LASTNAME')+' (*)'">
<b-form-input v-model="form.USR_LASTNAME"
autocomplete="off"
:state="validateState('USR_LASTNAME')"></b-form-input>
<b-form-invalid-feedback>{{$root.translation('ID_IS_REQUIRED')}}</b-form-invalid-feedback>
:state="validate.USR_LASTNAME.state"
@keyup="validateLastName"
:disabled="disabled"></b-form-input>
<b-form-invalid-feedback>{{validate.USR_LASTNAME.message}}</b-form-invalid-feedback>
</b-form-group>
</b-col>
<b-col cols="1">
</b-col>
<b-col cols="3">
<b-avatar rounded
ref="userAvatar"
size="5rem"
button
@click="avatarClick"
badge-variant="light"
style="position: absolute;right:30px;">
:src="urlImage"
:disabled="disabled">
</b-avatar>
</b-col>
</b-row>
@@ -37,7 +44,8 @@
<b-col cols="3">
<b-form-group :label="$root.translation('ID_ADDRESS')">
<b-form-input v-model="form.USR_ADDRESS"
autocomplete="off"/>
autocomplete="off"
:disabled="disabled"/>
</b-form-group>
</b-col>
<b-col cols="2">
@@ -45,7 +53,8 @@
<b-col cols="3">
<b-form-group :label="$root.translation('ID_ZIP_CODE')">
<b-form-input v-model="form.USR_ZIP_CODE"
autocomplete="off"/>
autocomplete="off"
:disabled="disabled"/>
</b-form-group>
</b-col>
<b-col cols="1">
@@ -55,7 +64,8 @@
<b-form-input v-model="form.USR_USERNAME"
autocomplete="off"
:state="validate.USR_USERNAME.state"
@keyup="validateUserName"></b-form-input>
@keyup="validateUserName"
:disabled="disabled"></b-form-input>
<b-form-valid-feedback><span v-html="validate.USR_USERNAME.message"></span></b-form-valid-feedback>
<b-form-invalid-feedback><span v-html="validate.USR_USERNAME.message"></span></b-form-invalid-feedback>
</b-form-group>
@@ -66,20 +76,23 @@
<b-form-group :label="$root.translation('ID_COUNTRY')">
<b-form-select v-model="form.USR_COUNTRY"
:options="countryList"
@change="getStateList"/>
@change="getStateList"
:disabled="disabled"/>
</b-form-group>
</b-col>
<b-col cols="2">
<b-form-group :label="$root.translation('ID_STATE_REGION')">
<b-form-select v-model="form.USR_CITY"
:options="stateList"
@change="getLocationList"/>
@change="getLocationList"
:disabled="disabled"/>
</b-form-group>
</b-col>
<b-col cols="3">
<b-form-group :label="$root.translation('ID_CITY')">
<b-form-select v-model="form.USR_LOCATION"
:options="locationList"/>
:options="locationList"
:disabled="disabled"/>
</b-form-group>
</b-col>
<b-col cols="1">
@@ -88,8 +101,10 @@
<b-form-group :label="$root.translation('ID_EMAIL')+' (*)'">
<b-form-input v-model="form.USR_EMAIL"
autocomplete="off"
:state="validateState('USR_EMAIL')"></b-form-input>
<b-form-invalid-feedback>{{$root.translation('ID_EMAIL_ENTER_VALID')}}</b-form-invalid-feedback>
:state="validate.USR_EMAIL.state"
@keyup="validateEmail"
:disabled="disabled"></b-form-input>
<b-form-invalid-feedback>{{validate.USR_EMAIL.message}}</b-form-invalid-feedback>
</b-form-group>
</b-col>
</b-row>
@@ -97,7 +112,8 @@
<b-col cols="3">
<b-form-group :label="$root.translation('ID_PHONE')">
<b-form-input v-model="form.USR_PHONE"
autocomplete="off"/>
autocomplete="off"
:disabled="disabled"/>
</b-form-group>
</b-col>
<b-col cols="2">
@@ -105,7 +121,8 @@
<b-col cols="3">
<b-form-group :label="$root.translation('ID_POSITION')">
<b-form-input v-model="form.USR_POSITION"
autocomplete="off"/>
autocomplete="off"
:disabled="disabled"/>
</b-form-group>
</b-col>
<b-col cols="1">
@@ -113,30 +130,33 @@
<b-col cols="3">
<b-form-group :label="$root.translation('ID_STATUS')">
<b-form-select v-model="form.USR_STATUS"
:options="userStatus"/>
:options="userStatus"
:disabled="disabled"/>
</b-form-group>
</b-col>
</b-row>
<b-row>
<b-col cols="3">
<b-col cols="5">
<b-form-group :label="$root.translation('ID_REPLACED_BY')">
<b-input-group>
<b-input-group-prepend class="w-25">
<b-form-input v-model="filterUser"
autocomplete="off"
@keyup="getUsersList"
placeholder="search"></b-form-input>
placeholder="search"
:disabled="disabled"></b-form-input>
</b-input-group-prepend>
<b-form-select v-model="form.USR_REPLACED_BY"
:options="usersList"></b-form-select>
:options="usersList"
:disabled="disabled"></b-form-select>
</b-input-group>
</b-form-group>
</b-col>
<b-col cols="2"></b-col>
<b-col cols="3">
<b-form-group :label="$root.translation('ID_CALENDAR')">
<b-form-select v-model="form.USR_CALENDAR"
:options="availableCalendars"/>
:options="availableCalendars"
:disabled="disabled"/>
</b-form-group>
</b-col>
<b-col cols="1">
@@ -144,7 +164,8 @@
<b-col cols="3">
<b-form-group :label="$root.translation('ID_EXPIRATION_DATE')">
<b-form-datepicker v-model="form.USR_DUE_DATE"
:date-format-options="{year:'numeric',month:'numeric',day:'numeric'}"/>
:date-format-options="{year:'numeric',month:'numeric',day:'numeric'}"
:disabled="disabled"/>
</b-form-group>
</b-col>
</b-row>
@@ -152,7 +173,8 @@
<b-col cols="3">
<b-form-group :label="$root.translation('ID_TIME_ZONE')">
<b-form-select v-model="form.USR_TIME_ZONE"
:options="timeZoneList"/>
:options="timeZoneList"
:disabled="disabled"/>
</b-form-group>
</b-col>
<b-col cols="2">
@@ -160,7 +182,8 @@
<b-col cols="3">
<b-form-group :label="$root.translation('ID_DEFAULT_LANGUAGE')">
<b-form-select v-model="form.USR_DEFAULT_LANG"
:options="languagesList"/>
:options="languagesList"
:disabled="disabled"/>
</b-form-group>
</b-col>
<b-col cols="1">
@@ -169,7 +192,8 @@
<b-form-group :label="$root.translation('ID_ROLE')">
<b-form-select v-model="form.USR_ROLE"
:options="rolesList"
@change="changeRole"/>
@change="changeRole"
:disabled="disabled"/>
</b-form-group>
</b-col>
</b-row>
@@ -177,7 +201,8 @@
<b-col cols="3">
<b-form-group :label="$root.translation('ID_DEFAULT_MAIN_MENU_OPTION')">
<b-form-select v-model="form.PREF_DEFAULT_MENUSELECTED"
:options="defaultMainMenuOptionList"/>
:options="defaultMainMenuOptionList"
:disabled="disabled"/>
</b-form-group>
</b-col>
<b-col cols="2">
@@ -185,18 +210,22 @@
<b-col cols="3">
<b-form-group :label="$root.translation('ID_DEFAULT_CASES_MENU_OPTION')">
<b-form-select v-model="form.PREF_DEFAULT_CASES_MENUSELECTED"
:options="defaultCasesMenuOptionList"/>
:options="defaultCasesMenuOptionList"
:disabled="disabled"/>
</b-form-group>
</b-col>
<b-col cols="1">
</b-col>
<b-col cols="3">
<b-form-group :label="$root.translation('ID_NEW_PASSWORD')+' (*)'">
<b-form-group :label="$root.translation('ID_NEW_PASSWORD')+' (*)'"
:class="classCustom">
<b-form-input v-model="form.USR_NEW_PASS"
autocomplete="off"
:state="validate.USR_NEW_PASS.state"
type="password"
@keyup="validatePassword"></b-form-input>
@keyup="validatePassword"
@change="editing=false;"
:disabled="disabled"></b-form-input>
<b-form-valid-feedback><span v-html="validate.USR_NEW_PASS.message"></span></b-form-valid-feedback>
<b-form-invalid-feedback><span v-html="validate.USR_NEW_PASS.message"></span></b-form-invalid-feedback>
</b-form-group>
@@ -208,12 +237,15 @@
<b-col cols="3"></b-col>
<b-col cols="1"></b-col>
<b-col cols="3">
<b-form-group :label="$root.translation('ID_CONFIRM_PASSWORD')+' (*)'">
<b-form-group :label="$root.translation('ID_CONFIRM_PASSWORD')+' (*)'"
:class="classCustom">
<b-form-input v-model="form.USR_CNF_PASS"
autocomplete="off"
:state="validate.USR_CNF_PASS.state"
type="password"
@keyup="validateConfirmationPassword"></b-form-input>
@keyup="validateConfirmationPassword"
@change="editing=false;"
:disabled="disabled"></b-form-input>
<b-form-invalid-feedback><span v-html="validate.USR_CNF_PASS.message"></span></b-form-invalid-feedback>
</b-form-group>
</b-col>
@@ -232,7 +264,8 @@
<b-form-input v-model="form.USR_EXTENDED_ATTRIBUTES_DATA[userExtendedAttribute.attributeId]"
autocomplete="off"
:type="userExtendedAttribute.password===1?'password':'text'"
:state="validateExtendedAttribute(userExtendedAttribute)"></b-form-input>
:state="validateExtendedAttribute(userExtendedAttribute)"
:disabled="disabled"></b-form-input>
<b-form-invalid-feedback>{{$root.translation('ID_IS_REQUIRED')}}</b-form-invalid-feedback>
</b-form-group>
</div>
@@ -247,28 +280,32 @@
<b-form-group :label="$root.translation('ID_COST_BY_HOUR')">
<b-form-input v-model="form.USR_COST_BY_HOUR"
autocomplete="off"
:state="validateState('USR_COST_BY_HOUR')"></b-form-input>
<b-form-invalid-feedback>{{$root.translation('ID_INVALID_VALUE',[$root.translation('ID_COST_BY_HOUR')])}}</b-form-invalid-feedback>
:state="validate.USR_COST_BY_HOUR.state"
@keyup="validateCostByHour"
:disabled="disabled"></b-form-input>
<b-form-invalid-feedback>{{validate.USR_COST_BY_HOUR.message}}</b-form-invalid-feedback>
</b-form-group>
<b-form-group :label="$root.translation('ID_UNITS')">
<b-form-input v-model="form.USR_UNIT_COST"
autocomplete="off"/>
autocomplete="off"
:disabled="disabled"/>
</b-form-group>
</fieldset>
</b-col>
</b-row>
<b-row>
<b-row :class="classCustom">
<b-col cols="12">
<b-form-group class="mt-4">
<b-form-checkbox v-model="form.USR_LOGGED_NEXT_TIME"
value="1"
unchecked-value="0">
unchecked-value="0"
:disabled="disabled">
{{$root.translation('ID_USER_MUST_CHANGE_PASSWORD_AT_NEXT_LOGON')}}
</b-form-checkbox>
</b-form-group>
</b-col>
</b-row>
<b-row>
<b-row :class="classCustom">
<b-col cols="12">
<b-form-group class="mt-4 float-right">
<b-button variant="danger"
@@ -279,6 +316,14 @@
</b-form-group>
</b-col>
</b-row>
<b-row :class="classCustom2">
<b-col cols="12">
<b-form-group class="mt-4 float-right">
<b-button variant="success"
@click="editPersonalInformation">{{$root.translation('ID_EDIT')}}</b-button>
</b-form-group>
</b-col>
</b-row>
</b-container>
</b-form>
</div>
@@ -287,30 +332,10 @@
<script>
import titleSection from "./titleSection.vue"
import axios from "axios"
import { validationMixin } from "vuelidate"
import { required, numeric, email } from "vuelidate/lib/validators"
export default {
mixins: [validationMixin],
components: {
titleSection
},
validations: {
form: {
USR_FIRSTNAME: {
required
},
USR_LASTNAME: {
required
},
USR_EMAIL: {
required,
email
},
USR_COST_BY_HOUR: {
numeric
}
}
},
data() {
return {
form: {
@@ -340,14 +365,26 @@
USR_NEW_PASS: "",
USR_CNF_PASS: "",
USR_LOGGED_NEXT_TIME: "0",
//
USR_EXTENDED_ATTRIBUTES_DATA: []
USR_EXTENDED_ATTRIBUTES_DATA: [],
USR_PHOTO: ""
},
validate: {
USR_FIRSTNAME: {
message: "",
state: null
},
USR_LASTNAME: {
message: "",
state: null
},
USR_USERNAME: {
message: "",
state: null
},
USR_EMAIL: {
message: "",
state: null
},
USR_NEW_PASS: {
message: "",
state: null
@@ -355,6 +392,10 @@
USR_CNF_PASS: {
message: "",
state: null
},
USR_COST_BY_HOUR: {
message: "",
state: null
}
},
countryList: [{
@@ -384,66 +425,97 @@
rolesList: [],
userExtendedAttributesList: [],
disableButtonSave: false,
editing: false
editing: false,
urlImage: "",
disabled: false,
classCustom: "",
classCustom2: ""
};
},
mounted() {
this.$nextTick(function () {
let promise = null;
if ("USR_UID" in window && window.USR_UID !== "") {
this.editing = true;
promise = this.load();
promise.then(response => {
response;
this.loadServices();
});
} else {
this.editing = false;
this.loadServices();
}
//additional modes
if (this.$root.modeOfForm() === 1) {
this.disabled = false;
this.classCustom = "";
this.classCustom2 = "sr-only sr-only-focusable";
}
if (this.$root.modeOfForm() === 2) {
this.disabled = true;
this.classCustom = "sr-only sr-only-focusable";
this.classCustom2 = "";
}
if (this.$root.canEdit() === false) {
this.classCustom2 = "sr-only sr-only-focusable";
}
});
},
methods: {
editPersonalInformation() {
this.classCustom = "";
this.classCustom2 = "sr-only sr-only-focusable";
this.disabled = false;
},
cancel() {
window.location = this.$root.baseUrl() + "users/users_List";
if (this.$root.modeOfForm() === 1) {
window.location = this.$root.baseUrl() + "users/users_List";
}
if (this.$root.modeOfForm() === 2) {
this.classCustom = "sr-only sr-only-focusable";
this.classCustom2 = "";
this.disabled = true;
for (let i in this.validate) {
this.validate[i].state = null;
}
}
},
onsubmit() {
this.$v.form.$touch();
if (this.$v.form.$anyError) {
return;
}
if (this.form.USR_UID.trim() === "") {
if (this.form.USR_USERNAME.trim() === "") {
this.validate.USR_USERNAME.message = this.$root.translation('ID_IS_REQUIRED');
this.validate.USR_USERNAME.state = false;
this.disableButtonSave = true;
return;
}
if (this.form.USR_NEW_PASS.trim() === "") {
this.validate.USR_NEW_PASS.message = this.$root.translation('ID_IS_REQUIRED');
this.validate.USR_NEW_PASS.state = false;
this.disableButtonSave = true;
return;
}
if (this.form.USR_CNF_PASS.trim() === "") {
this.validate.USR_CNF_PASS.message = this.$root.translation('ID_IS_REQUIRED');
this.validate.USR_CNF_PASS.state = false;
this.disableButtonSave = true;
return;
}
if (this.form.USR_CNF_PASS.trim() !== this.form.USR_NEW_PASS.trim()) {
this.validate.USR_CNF_PASS.message = this.$root.translation("ID_NEW_PASS_SAME_OLD_PASS");
this.validate.USR_CNF_PASS.state = false;
this.disableButtonSave = true;
return;
}
}
for (let i in this.userExtendedAttributesList) {
let status = this.validateExtendedAttribute(this.userExtendedAttributesList[i]);
if (this.userExtendedAttributesList[i].required === 1) {
if (status === null || status === false) {
this.validateFirstName();
this.validateLastName();
let promise = this.validateUserName();
promise.then(response => {
response;
this.validateEmail();
let promise2 = this.validatePassword();
promise2.then(response2 => {
response2;
this.validateConfirmationPassword();
this.validateCostByHour();
if (this.validate.USR_FIRSTNAME.state === false ||
this.validate.USR_LASTNAME.state === false ||
this.validate.USR_USERNAME.state === false ||
this.validate.USR_EMAIL.state === false ||
this.validate.USR_NEW_PASS.state === false ||
this.validate.USR_CNF_PASS.state === false ||
this.validate.USR_COST_BY_HOUR.state === false
) {
return;
}
}
}
for (let i in this.userExtendedAttributesList) {
let status = this.validateExtendedAttribute(this.userExtendedAttributesList[i]);
if (this.userExtendedAttributesList[i].required === 1) {
if (status === null || status === false) {
return;
}
}
}
this.save();
});
});
},
save() {
//get form data
let extendedAttributes = {};
for (let i in this.userExtendedAttributesList) {
@@ -453,9 +525,7 @@
extendedAttributes[attributeId] = value;
}
}
let formData = new FormData();
formData.append("_token", "EE2sNzIAdIYNLJE8UQY2Qj7CyewqtPkMRusDviix");
formData.append("USR_FIRSTNAME", this.form.USR_FIRSTNAME);
formData.append("USR_LASTNAME", this.form.USR_LASTNAME);
formData.append("USR_USERNAME", this.form.USR_USERNAME);
@@ -480,7 +550,7 @@
formData.append("currentPassword", "");
formData.append("USR_NEW_PASS", this.form.USR_NEW_PASS);
formData.append("USR_CNF_PASS", this.form.USR_CNF_PASS);
formData.append("USR_PHOTO", "");
formData.append("USR_PHOTO", this.form.USR_PHOTO);
formData.append("PREF_DEFAULT_MENUSELECTED", this.form.PREF_DEFAULT_MENUSELECTED);
formData.append("PREF_DEFAULT_CASES_MENUSELECTED", this.form.PREF_DEFAULT_CASES_MENUSELECTED);
formData.append("action", "saveUser");
@@ -488,7 +558,7 @@
formData.append("USR_LOGGED_NEXT_TIME", this.form.USR_LOGGED_NEXT_TIME);
formData.append("USR_EXTENDED_ATTRIBUTES_DATA", JSON.stringify(extendedAttributes));
formData.append("_token", document.querySelector('meta[name="csrf-token"]').content);
axios.post(this.$root.baseUrl() + "users/usersAjax", formData)
return axios.post(this.$root.baseUrl() + "users/usersAjax", formData)
.then(response => {
response;
if ("error" in response.data && response.data.error !== "") {
@@ -505,8 +575,19 @@
}).catch(err => {
err;
});
} else {
if (this.$root.modeOfForm() === 1) {
window.location = this.$root.baseUrl() + "users/users_List";
}
if (this.$root.modeOfForm() === 2) {
this.classCustom = "sr-only sr-only-focusable";
this.classCustom2 = "";
this.disabled = true;
for (let i in this.validate) {
this.validate[i].state = null;
}
}
}
window.location = this.$root.baseUrl() + "users/users_List";
})
.catch(error => {
error;
@@ -514,11 +595,30 @@
.finally(() => {
});
},
validateState(name) {
const {$dirty, $error} = this.$v.form[name];
return $dirty ? !$error : null;
validateFirstName() {
this.validate.USR_FIRSTNAME.state = true;
if (this.form.USR_FIRSTNAME.trim() === "") {
this.validate.USR_FIRSTNAME.state = false;
this.validate.USR_FIRSTNAME.message = this.$root.translation('ID_IS_REQUIRED');
}
},
validateLastName() {
this.validate.USR_LASTNAME.state = true;
if (this.form.USR_LASTNAME.trim() === "") {
this.validate.USR_LASTNAME.state = false;
this.validate.USR_LASTNAME.message = this.$root.translation('ID_IS_REQUIRED');
}
},
validateUserName() {
this.validate.USR_USERNAME.state = true;
if (this.form.USR_USERNAME.trim() === "") {
this.validate.USR_USERNAME.state = false;
this.validate.USR_USERNAME.message = this.$root.translation('ID_IS_REQUIRED');
return new Promise((resolve, reject) => {
resolve();
reject;
});
}
this.disableButtonSave = true;
let formData = new FormData();
formData.append("action", "testUsername");
@@ -527,14 +627,13 @@
return axios.post(this.$root.baseUrl() + "users/usersAjax", formData)
.then(response => {
response;
this.disableButtonSave = false;
this.validate.USR_USERNAME.message = response.data.descriptionText;
if (response.data.exists === false) {
this.validate.USR_USERNAME.state = true;
this.disableButtonSave = false;
return;
}
this.validate.USR_USERNAME.state = false;
this.disableButtonSave = true;
})
.catch(error => {
error;
@@ -542,7 +641,34 @@
.finally(() => {
});
},
validateEmail() {
this.validate.USR_EMAIL.state = true;
if (this.form.USR_EMAIL.trim() === "") {
this.validate.USR_EMAIL.state = false;
this.validate.USR_EMAIL.message = this.$root.translation('ID_IS_REQUIRED');
return;
}
if (/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@([a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4}))|((([1-9]?[0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]).){3}([1-9]?[0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))$/i.test(this.form.USR_EMAIL) === false) {
this.validate.USR_EMAIL.state = false;
this.validate.USR_EMAIL.message = this.$root.translation('ID_INVALID_VALUE', [this.$root.translation('ID_EMAIL')]);
}
},
validatePassword() {
this.validate.USR_NEW_PASS.state = true;
if (this.editing === true) {
return new Promise((resolve, reject) => {
resolve();
reject;
});
}
if (this.form.USR_NEW_PASS.trim() === "") {
this.validate.USR_NEW_PASS.state = false;
this.validate.USR_NEW_PASS.message = this.$root.translation('ID_IS_REQUIRED');
return new Promise((resolve, reject) => {
resolve();
reject;
});
}
this.disableButtonSave = true;
let formData = new FormData();
formData.append("action", "testPassword");
@@ -550,14 +676,10 @@
return axios.post(this.$root.baseUrl() + "users/usersAjax", formData)
.then(response => {
response;
this.disableButtonSave = false;
let status = (response.data.STATUS === true);
this.validate.USR_NEW_PASS.state = status;
this.validate.USR_NEW_PASS.message = response.data.DESCRIPTION;
if (response.data.STATUS === true) {
this.validate.USR_NEW_PASS.state = true;
this.disableButtonSave = false;
return;
}
this.validate.USR_NEW_PASS.state = false;
this.disableButtonSave = true;
})
.catch(error => {
error;
@@ -566,15 +688,35 @@
});
},
validateConfirmationPassword() {
this.disableButtonSave = true;
this.validate.USR_CNF_PASS.message = this.$root.translation("ID_NEW_PASS_SAME_OLD_PASS");
if (this.form.USR_CNF_PASS === this.form.USR_NEW_PASS) {
this.validate.USR_CNF_PASS.state = true;
this.disableButtonSave = false;
this.validate.USR_CNF_PASS.state = true;
if (this.editing === true) {
return new Promise((resolve, reject) => {
resolve();
reject;
});
}
if (this.form.USR_CNF_PASS.trim() === "") {
this.validate.USR_CNF_PASS.state = false;
this.validate.USR_CNF_PASS.message = this.$root.translation('ID_IS_REQUIRED');
return;
}
this.validate.USR_CNF_PASS.state = false;
this.disableButtonSave = true;
if (this.form.USR_CNF_PASS !== this.form.USR_NEW_PASS) {
this.validate.USR_CNF_PASS.state = false;
this.validate.USR_CNF_PASS.message = this.$root.translation("ID_NEW_PASS_SAME_OLD_PASS");
}
},
validateCostByHour() {
this.validate.USR_COST_BY_HOUR.state = true;
this.form.USR_COST_BY_HOUR = this.form.USR_COST_BY_HOUR.toString();
if (this.form.USR_COST_BY_HOUR.trim() === "") {
this.validate.USR_COST_BY_HOUR.state = false;
this.validate.USR_COST_BY_HOUR.message = this.$root.translation('ID_IS_REQUIRED');
return;
}
if (/^[0-9]/i.test(this.form.USR_COST_BY_HOUR) === false) {
this.validate.USR_COST_BY_HOUR.state = false;
this.validate.USR_COST_BY_HOUR.message = this.$root.translation('ID_INVALID_VALUE', [this.$root.translation('ID_COST_BY_HOUR')]);
}
},
validateExtendedAttribute(obj) {
let value = this.form.USR_EXTENDED_ATTRIBUTES_DATA[obj.attributeId];
@@ -587,6 +729,7 @@
return null;
},
load() {
this.urlImage = this.$root.baseUrl() + 'users/users_ViewPhotoGrid?pUID=' + window.USR_UID + '&h=' + Math.random();
let formData = new FormData();
formData.append("action", "userData");
formData.append("USR_UID", window.USR_UID);
@@ -886,6 +1029,43 @@
day = "0" + day;
return [year + 1, month, day].join("-");
},
avatarClick() {
let form = document.createElement('form');
var input = document.createElement("input");
input.type = "file";
form.appendChild(input);
form.style.display = "none";
document.body.appendChild(form);
let that = this;
input.onchange = function () {
var file = input.files[0];
//validate file extension
if (/(\.jpg|\.jpeg|\.png|\.gif)$/i.test(file.name) === false) {
that.$bvModal.msgBoxOk(that.$root.translation('ID_INVALID_EXTENSION'), {
title: " ", //is important because title disappear
hideHeaderClose: false,
okTitle: that.$root.translation('ID_OK'),
okVariant: "success",
okOnly: true
}).then(value => {
if (value === false) {
return;
}
}).catch(err => {
err;
});
return;
}
that.form.USR_PHOTO = file;
//preview
var reader = new FileReader();
reader.onload = function (e) {
that.urlImage = e.target.result;
};
reader.readAsDataURL(file);
};
input.click();
},
changeRole() {
this.getUserExtendedAttributesList();
}

14
workflow/engine/methods/userPersonalInformation/src/main.js
View File

@@ -28,6 +28,20 @@ new Vue({
},
baseUrl() {
return "../";
},
canEdit() {
let canEdit = true;
if ("canEdit" in window) {
canEdit = window.canEdit;
}
return canEdit;
},
modeOfForm() {
let modeOfForm = 1;
if ("modeOfForm" in window) {
modeOfForm = window.modeOfForm;
}
return modeOfForm;
}
}
}).$mount('#app');

5
workflow/engine/methods/users/userMain.php
View File

@@ -1,7 +1,8 @@
<?php
$headPublisher = headPublisher::getSingleton();
$headPublisher->addContent("users" . PATH_SEP . "userMain"); //Adding a html file .html
$headPublisher->addExtJsScript("users" . PATH_SEP . "userMain", true); //Adding a javascript file .js
$headPublisher->assign("CREATE_CLIENT", (isset($_GET["create_app"]))? 1 : 0);
$headPublisher->assign("CREATE_CLIENT", (isset($_GET["create_app"])) ? 1 : 0);
$headPublisher->assign("userInterface", (isset($_REQUEST["userInterface"]) ? $_REQUEST["userInterface"] : ""));
G::RenderPage("publish", "extJs");

13
workflow/engine/methods/users/usersInit.php
View File

@@ -53,6 +53,19 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
$arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));
if (isset($_REQUEST['userInterface']) && $_REQUEST['userInterface'] === "v2") {
$lang = defined("SYS_LANG") ? SYS_LANG : "en";
$html = file_get_contents(PATH_HTML . "lib/userPersonalInformation/index.html");
$html = str_replace("var USR_UID='';", "var USR_UID='{$aFields['USR_UID']}';", $html);
$html = str_replace("translation.en.js", "translation.{$lang}.js", $html);
$html = str_replace("csrfToken", csrfToken(), $html);
$html = str_replace("var canEdit=true;", ($canEdit === false ? "var canEdit=true;" : "var canEdit=false;"), $html);
$html = str_replace("var modeOfForm=1;", "var modeOfForm=2;", $html);
echo $html;
exit();
}
$oHeadPublisher = headPublisher::getSingleton();
$oHeadPublisher->addExtJsScript('users/users', true); //adding a javascript file .js
// $oHeadPublisher->addContent('users/users'); //adding a html file .html.

2
workflow/engine/templates/users/userMain.js
View File

@@ -22,7 +22,7 @@ userMain.application = {
id: "nodeInfo",
text: "Personal Information",
leaf: true,
url: "../users/usersInit"
url: "../users/usersInit?userInterface=" + userInterface
}
]

2
workflow/engine/templates/users/usersLoad.php
View File

@@ -12,7 +12,7 @@
}
</style>
<body onresize="autoResizeScreen()" onload="autoResizeScreen()">
<iframe name="frameMain" id="frameMain" src ="../users/userMain<?php echo ((isset($_GET["create_app"]))? "?create_app" : ""); ?>" width="100%" height="200" frameborder="0">
<iframe name="frameMain" id="frameMain" src ="../users/userMain<?php echo ((isset($_GET["create_app"]))? "?userInterface=v2&create_app" : "?userInterface=v2"); ?>" width="100%" height="200" frameborder="0">
<p>Your browser does not support iframes.</p>
</iframe>
</body>