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

- fixed issue in datepicker;

Browse Source 
- updated styles;
This commit is contained in:
Vitalii Kiiko
2024-11-21 12:42:03 +01:00
parent 7c2feb20c7
commit 1e1d16b3cd
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/assets/scss/components/appPage.scss
View File

@@ -221,22 +221,29 @@
flex-direction: column; flex-direction: column;
padding: 0; padding: 0;
width: 100%; width: 100%;
}
> li { .appPageSection__listItem {
padding: 15px; padding: 15px;
border-bottom: 1px solid var(--button-secondary-borderColor); border-bottom: 1px solid var(--button-secondary-borderColor);
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
gap: 1rem; gap: 1rem;
&.row { &.row {
flex-direction: row; flex-direction: row;
}
} }
} }
.appPageSection__listItemRow {
display: flex;
flex-direction: row;
justify-content: space-between;
gap: 16px;
}
.appPageSection__checklist { .appPageSection__checklist {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

4
src/components/FormField/components/Datepicker/index.js
View File

@@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import { classNames } from 'primereact/utils'; import { classNames } from 'primereact/utils';
import { Controller } from 'react-hook-form'; import { Controller } from 'react-hook-form';
import { is } from 'ramda'; import { is, isEmpty } from 'ramda';
import { Calendar } from 'primereact/calendar'; import { Calendar } from 'primereact/calendar';
@@ -30,7 +30,7 @@ const Datepicker = ({
rules={config} rules={config}
render={({ field, fieldState }) => (<Calendar id={field.name} render={({ field, fieldState }) => (<Calendar id={field.name}
disabled={disabled} disabled={disabled}
value={is(String, field.value) ? new Date(field.value) : field.value} value={is(String, field.value) && !isEmpty(field.value) ? new Date(field.value) : field.value}
onChange={(e) => field.onChange(e.value)} onChange={(e) => field.onChange(e.value)}
dateFormat="dd/mm/yy" dateFormat="dd/mm/yy"
hourFormat="24" hourFormat="24"

10
src/pages/DomandaEditPreInstructor/index.js
View File

@@ -259,7 +259,7 @@ const DomandaEditPreInstructor = () => {
} }
const shouldDisableField = (fieldName) => { const shouldDisableField = (fieldName) => {
return !['EVALUATION'].includes(data.status) || ['ADMISSIBLE'].includes(data.status) && fieldName !== 'criteria' return !['EVALUATION', 'OPEN'].includes(data.status) || ['ADMISSIBLE'].includes(data.status) && fieldName !== 'criteria'
} }
useEffect(() => { useEffect(() => {
@@ -454,12 +454,8 @@ const DomandaEditPreInstructor = () => {
<div> <div>
<h3>{__('Documenti allegati', 'gepafin')}</h3> <h3>{__('Documenti allegati', 'gepafin')}</h3>
<ol className="appPageSection__list"> <ol className="appPageSection__list">
{data.files.map((o, i) => <li key={o.id}> {data.files.map((o, i) => <li key={o.id} className="appPageSection__listItem">
<div className="appPageSection" style={{ <div className="appPageSection__listItemRow">
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between'
}}>
<span>{o.label}</span> <span>{o.label}</span>
<div className="appPageSection__iconActions"> <div className="appPageSection__iconActions">
{o.fileDetail && o.fileDetail.length === 1 {o.fileDetail && o.fileDetail.length === 1