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

Merge pull request #21 from Kitzanos/master-sync/05-12-2024

Browse Source 
Master sync/05 12 2024
This commit is contained in:
Vitalii Kiiko
2024-12-05 09:42:46 +01:00
committed by GitHub
parent 3ea0e961b9 4081b8b375
commit 49e943d935
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/Dashboard/components/DraftApplicationsTable/index.js
View File

@@ -16,13 +16,9 @@ import ApplicationService from '../../../../service/application-service';
import { FilterMatchMode, FilterOperator } from 'primereact/api'; import { FilterMatchMode, FilterOperator } from 'primereact/api';
import { DataTable } from 'primereact/datatable'; import { DataTable } from 'primereact/datatable';
import { Column } from 'primereact/column'; import { Column } from 'primereact/column';
import { InputText } from 'primereact/inputtext';
import { IconField } from 'primereact/iconfield';
import { InputIcon } from 'primereact/inputicon';
import { Dropdown } from 'primereact/dropdown'; import { Dropdown } from 'primereact/dropdown';
import { ProgressBar } from 'primereact/progressbar'; import { ProgressBar } from 'primereact/progressbar';
import { Button } from 'primereact/button'; import { Button } from 'primereact/button';
//import { Calendar } from 'primereact/calendar';
import { Tag } from 'primereact/tag'; import { Tag } from 'primereact/tag';
import ProperBandoLabel from '../../../../components/ProperBandoLabel'; import ProperBandoLabel from '../../../../components/ProperBandoLabel';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';

1
src/pages/DomandaBeneficiario/index.js
View File

@@ -289,6 +289,7 @@ const DomandaBeneficiario = () => {
errors={errors} errors={errors}
defaultValue={formInitialData[o.fieldId] ? formInitialData[o.fieldId] : []} defaultValue={formInitialData[o.fieldId] ? formInitialData[o.fieldId] : []}
accept={[]} accept={[]}
source="AMENDMENT"
sourceId={data.applicationId} sourceId={data.applicationId}
multiple={true} multiple={true}
/> />

2
src/pages/Login/index.js
View File

@@ -116,7 +116,7 @@ const Login = () => {
/*if ('t7jh5wfg9QXylNaTZkPoE' === APP_HUB_ID) { /*if ('t7jh5wfg9QXylNaTZkPoE' === APP_HUB_ID) {
setIsMaintenance(true); setIsMaintenance(true);
}*/ }*/
hotkeys('command+x', function(event, handler){ hotkeys('command+x,ctrl+x', function(event, handler){
window.location.replace('/loginadmin') window.location.replace('/loginadmin')
}); });
}, []); }, []);

1
src/pages/SoccorsoEditPreInstructor/index.js
View File

@@ -407,6 +407,7 @@ const SoccorsoEditPreInstructor = () => {
errors={errors} errors={errors}
defaultValue={formInitialData[o.fieldId] ? formInitialData[o.fieldId] : []} defaultValue={formInitialData[o.fieldId] ? formInitialData[o.fieldId] : []}
accept={[]} accept={[]}
source="AMENDMENT"
sourceId={data.applicationId} sourceId={data.applicationId}
multiple={true} multiple={true}
/> />