Merge branch 'develop' into featue/84-ndg-appointment-flow

This commit is contained in:
Vitalii Kiiko
2024-12-10 16:34:52 +01:00

View File

@@ -267,9 +267,11 @@ const DomandaEditPreInstructor = () => {
switch (item.fieldName) { switch (item.fieldName) {
case 'fileupload' : case 'fileupload' :
content = <ul> content = <ul>
{item.fieldValue.map(o => <li key={o.id}> {item.fieldValue
{o.filePath ? <a href={o.filePath}>{o.name}</a> : null} ? item.fieldValue.map(o => <li key={o.id}>
</li>)} {o.filePath ? <a href={o.filePath}>{o.name}</a> : null}
</li>)
: null}
</ul>; </ul>;
break; break;
case 'table' : case 'table' :
@@ -281,9 +283,11 @@ const DomandaEditPreInstructor = () => {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{item.fieldValue.map((o, i) => <tr key={i}> {item.fieldValue
{Object.values(o).map(v => <td key={v}>{v}</td>)} ? item.fieldValue.map((o, i) => <tr key={i}>
</tr>)} {Object.values(o).map(v => <td key={v}>{v}</td>)}
</tr>)
: null}
</tbody> </tbody>
</table>; </table>;
break; break;
@@ -425,7 +429,7 @@ const DomandaEditPreInstructor = () => {
const doCreateAppointmentRequest = () => { const doCreateAppointmentRequest = () => {
if ( if (
!isEmpty(appointmentData.title) && !isEmpty(appointmentData.text) && !isEmpty(appointmentData.amount) !isEmpty(appointmentData.title) && !isEmpty(appointmentData.text) && !isEmpty(appointmentData.amount)
&& !isEmpty(appointmentData.duration) && appointmentData.duration !== 0 && appointmentData.amount !== 0 && !isEmpty(appointmentData.duration) && appointmentData.duration !== 0 && appointmentData.amount !== 0
) { ) {
console.log(appointmentData); console.log(appointmentData);
} }