BFLOWS/bflows-bandi-fe
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Vitalii Kiiko
2024-09-30 17:10:42 +02:00
parent c7d95699eb 524a39e5de
commit 128be9e245
7 changed files with 144 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/helpers/getDateFromISOstring.js
View File

@@ -1,6 +1,9 @@
const getDateFromISOstring = (value, options = {}) => {
const optionsMerged = options || { day: '2-digit', month: '2-digit', year: 'numeric', hour12: false }
return value ? Intl.DateTimeFormat('it-IT', optionsMerged).format(new Date(value)) : value;
const getDateFromISOstring = (
value,
options = {
day: '2-digit', month: '2-digit', year: 'numeric', hour12: false
}) => {
return value ? Intl.DateTimeFormat('it-IT', options).format(new Date(value)) : value;
}
export default getDateFromISOstring;

5
src/pages/BandoEdit/components/BandoEditFormActions/index.js
View File

@@ -5,12 +5,13 @@ import { isNil } from 'ramda';
// components
import { Button } from 'primereact/button';
const BandoEditFormActions = ({ id, openPreview, openPreviewEvaluation, status }) => {
const BandoEditFormActions = ({ id, openPreview, openPreviewEvaluation, submitFn }) => {
return (
<div className="appPageSection">
<div className="appPageSection__actions">
<Button
type="submit"
type="button"
onClick={submitFn}
label={__('Salva bozza', 'gepafin')} icon="pi pi-save" iconPos="right"/>
<Button
type="button"

22
src/pages/BandoEdit/components/BandoEditFormStep1/index.js
View File

@@ -63,6 +63,27 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
}
};
const onSaveDraft = () => {
const formData = getValues();
if (!isNil(formData.dates) && formData.dates.length) {
formData.dates = formData.dates.map(v => {
if (is(String, v)) {
return v;
} else {
const tzAwareDate = new TZDate(v, 'Europe/Berlin');
return tzAwareDate.toISOString().substring(0, 19);
}
});
}
storeSet.main.setAsyncRequest();
if (!formData.id) {
BandoService.createBando(formData, createCallback, errCreateCallback);
} else {
BandoService.updateBandoStep1(formData.id, formData, createCallback, errCreateCallback);
}
}
const createCallback = (data) => {
storeSet.main.unsetAsyncRequest();
if (data.status === 'SUCCESS') {
@@ -321,6 +342,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<BandoEditFormActions
id={values.id}
status={status}
submitFn={onSaveDraft}
openPreview={openPreview}
openPreviewEvaluation={openPreviewEvaluation}/>
</form>

22
src/pages/BandoEdit/components/BandoEditFormStep2/index.js
View File

@@ -67,6 +67,27 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
BandoService.updateBandoStep2(formData.id, forSubmit, createCallback, errCreateCallback);
};
const onSaveDraft = () => {
const formData = getValues();
if (!isNil(formData.dates) && formData.dates.length) {
formData.dates = formData.dates.map(v => {
if (is(String, v)) {
return v;
} else {
const tzAwareDate = new TZDate(v, 'Europe/Berlin');
return tzAwareDate.toISOString().substring(0, 19);
}
});
}
storeSet.main.setAsyncRequest();
if (!formData.id) {
BandoService.createBando(formData, createCallback, errCreateCallback);
} else {
BandoService.updateBandoStep1(formData.id, formData, createCallback, errCreateCallback);
}
}
const createCallback = (data) => {
storeSet.main.unsetAsyncRequest();
if (data.status === 'SUCCESS') {
@@ -252,6 +273,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
<BandoEditFormActions
id={values.id}
status={status}
submitFn={onSaveDraft}
openPreview={openPreview}
openPreviewEvaluation={openPreviewEvaluation}/>
</form>

16
src/pages/BandoEdit/index.js
View File

@@ -47,7 +47,8 @@ const BandoEdit = () => {
//const values = formRef.current.getValues();
//const diffData = equal(values, data);
// TODO warn about unsaved data
if (isFormValid) {
goToStep(0);
/*if (isFormValid) {
goToStep(0)
} else {
bandoMsgs.current.show([
@@ -58,7 +59,7 @@ const BandoEdit = () => {
closable: true
}
]);
}
}*/
}
},
{
@@ -67,12 +68,14 @@ const BandoEdit = () => {
if (activeStep === 1) {
return false
}
console.log('11');
bandoMsgs.current.clear();
const isFormValid = formRef.current.isFormValid();
//const values = formRef.current.getValues();
//const diffData = equal(values, data);
// TODO warn about unsaved data
if (isFormValid) {
goToStep(1);
/*if (isFormValid) {
goToStep(1);
} else {
bandoMsgs.current.show([
@@ -83,7 +86,7 @@ const BandoEdit = () => {
closable: true
}
]);
}
}*/
}
}
];
@@ -235,8 +238,7 @@ const BandoEdit = () => {
if (bandoId === 0) {
setData({
status: 'draft',
name: ''
status: null
});
storeSet.main.unsetAsyncRequest();
@@ -293,7 +295,7 @@ const BandoEdit = () => {
? <Steps
model={stepItems}
activeIndex={activeStep}
readOnly={false}/>
readOnly={isNil(data.status)}/>
: null}
<BlockingOverlay shouldDisplay={isAsyncRequest}/>

96
src/pages/Users/index.js
View File

@@ -1,4 +1,4 @@
import React, { useState } from 'react';
import React, { useState, useEffect } from 'react';
import { __ } from '@wordpress/i18n';
import { isEmpty } from 'ramda';
@@ -6,13 +6,23 @@ import { isEmpty } from 'ramda';
import AllUsersTable from './components/AllUsersTable';
import { Button } from 'primereact/button';
import { InputText } from 'primereact/inputtext';
import { InputTextarea } from 'primereact/inputtextarea';
import { InputSwitch } from 'primereact/inputswitch';
import { Dropdown } from 'primereact/dropdown';
import { Dialog } from 'primereact/dialog';
import UserService from '../../service/user-service';
import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
import { storeSet } from '../../store';
import { klona } from 'klona';
const Users = () => {
const [isVisibleEditDialog, setIsVisibleEditDialog] = useState(false);
const [newUserData, setNewUserData] = useState({});
const [newUserData, setNewUserData] = useState({
firstName: '',
lastName: '',
email: '',
phoneNumber: '',
role: ''
});
const [roles, setRoles] = useState([]);
const onCreateNewUser = () => {
setIsVisibleEditDialog(true);
@@ -24,7 +34,13 @@ const Users = () => {
const hideEditDialog = () => {
setIsVisibleEditDialog(false);
setNewUserData({});
setNewUserData({
firstName: '',
lastName: '',
email: '',
phoneNumber: '',
role: ''
});
}
const saveEditDialog = () => {
@@ -32,7 +48,9 @@ const Users = () => {
}
const onChangeEditItem = (value, key) => {
const userData = klona(newUserData);
userData[key] = value;
setNewUserData(userData);
}
const footerEditDialog = () => {
@@ -45,6 +63,28 @@ const Users = () => {
</div>
}
const getRolesCallback = (data) => {
if (data.status === 'SUCCESS') {
const roles = data.data.map(o => ({
name: o.roleName,
value: o.id
}));
setRoles(roles)
}
storeSet.main.unsetAsyncRequest();
}
const errGetRolesCallback = (data) => {
set404FromErrorResponse(data);
storeSet.main.unsetAsyncRequest();
}
useEffect(() => {
if (isVisibleEditDialog) {
UserService.getRoles(getRolesCallback, errGetRolesCallback)
}
}, [isVisibleEditDialog]);
return(
<div className="appPage">
<div className="appPage__pageHeader">
@@ -64,24 +104,44 @@ const Users = () => {
<Dialog
visible={isVisibleEditDialog}
modal header={headerEditDialog}
modal
header={headerEditDialog}
footer={footerEditDialog}
style={{ maxWidth: '600px', width: '100%' }}
onHide={hideEditDialog}>
<div className="appPage__spacer"></div>
<div className="appForm__field">
<label>{__('Nome', 'gepafin')}</label>
<InputText value={''} onChange={(e) => onChangeEditItem(e.target.value, 'firstName')}/>
<div className="appForm__cols">
<div className="appForm__field">
<label>{__('Nome', 'gepafin')}*</label>
<InputText value={newUserData.firstName}
onChange={(e) => onChangeEditItem(e.target.value, 'firstName')}/>
</div>
<div className="appForm__field">
<label>{__('Cognome', 'gepafin')}*</label>
<InputText value={newUserData.lastName}
onChange={(e) => onChangeEditItem(e.target.value, 'lastName')}/>
</div>
</div>
<div className="appForm__cols">
<div className="appForm__field">
<label>{__('Email', 'gepafin')}*</label>
<InputText value={newUserData.email}
onChange={(e) => onChangeEditItem(e.target.value, 'email')}/>
</div>
<div className="appForm__field">
<label>{__('Telefono', 'gepafin')}</label>
<InputText value={newUserData.phoneNumber}
onChange={(e) => onChangeEditItem(e.target.value, 'phoneNumber')}/>
</div>
</div>
<div className="appForm__field">
<label>{__('Cognome', 'gepafin')}</label>
<InputText value={''} onChange={(e) => onChangeEditItem(e.target.value, 'lastName')}/>
</div>
<div className="appForm__field">
<label>{__('Risposta', 'gepafin')}</label>
<InputTextarea value={''} onChange={(e) => onChangeEditItem(e.target.value, 'response')}
rows={5}
cols={30}/>
<label>{__('Ruolo', 'gepafin')}</label>
<Dropdown
value={newUserData.role}
onChange={(e) => onChangeEditItem(e.value, 'role')}
options={roles}
optionLabel="name"
optionValue="value"/>
</div>
<div className="appPage__spacer"></div>
</Dialog>

4
src/service/user-service.js
View File

@@ -7,4 +7,8 @@ export default class UserService {
static updateUser = (id, body, callback, errCallback) => {
NetworkService.put(`${API_BASE_URL}/user/${id}`, body, callback, errCallback);
};
static getRoles = (callback, errCallback) => {
NetworkService.get(`${API_BASE_URL}/role`, callback, errCallback);
};
}