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

resolved conflicts

Browse Source
This commit is contained in:
rajesh
2024-09-14 13:15:47 +05:30
parent 4929dc01ce d70fda2141
commit 0e1ee7c438
36 changed files with 837 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/main/resources/db/changelog/db.changelog-1.0.0.xml
View File

@@ -564,7 +564,7 @@
<modifyDataType tableName="LOOKUP_DATA" columnName="title" newDataType="TEXT"/>
</changeSet>
<changeSet id="09-09-2024_1" author="Harish Bagora">
<changeSet id="09-09-2024_2" author="Harish Bagora">
<renameColumn tableName="document" oldColumnName="call_id" newColumnName="source_id" columnDataType="BIGINT"/>
<addColumn tableName="document">
<column name="source" type="VARCHAR(255)"/>
@@ -573,4 +573,97 @@
<dropForeignKeyConstraint baseTableName="document" constraintName="fk_call_document"/>
</changeSet>
<changeSet id="09-09-2024_1" author="Rajesh Khore">
<createTable tableName="application_form">
<column name="id" type="INTEGER" autoIncrement="true">
<constraints nullable="false" primaryKey="true" primaryKeyName="application_form_pkey"/>
</column>
<column name="form_id" type="INTEGER">
<constraints nullable="false" foreignKeyName="fk_form_application_form" references="form(id)"/>
</column>
<column name="order_no" type="VARCHAR(255)"></column>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="false"/>
</column>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/></column>
</createTable>
<createTable tableName="application_form_field">
<column name="id" type="INTEGER" autoIncrement="true">
<constraints nullable="false" primaryKey="true" primaryKeyName="application_form_field_pkey"/>
</column>
<column name="application_form_id" type="INTEGER">
<constraints nullable="false" foreignKeyName="fk_application_form_application_form_field" references="application_form(id)"/>
</column>
<column name="field_id" type="VARCHAR(255)" ></column>
<column name="field_value" type="VARCHAR(255)"></column>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="false"/>
</column>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/></column>
</createTable>
<createTable tableName="flow_edges">
<column name="id" type="INTEGER" autoIncrement="true">
<constraints nullable="false" primaryKey="true" primaryKeyName="flow_edges_pkey"/>
</column>
<column name="call_id" type="INTEGER">
</column>
<column name="source_id" type="INTEGER"></column>
<column name="target_id" type="INTEGER"></column>
<column name="type" type="VARCHAR(255)"></column>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="false"/>
</column>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/></column>
</createTable>
<createTable tableName="flow_data">
<column name="id" type="INTEGER" autoIncrement="true">
<constraints nullable="false" primaryKey="true" primaryKeyName="flow_data_pkey"/>
</column>
<column name="call_id" type="INTEGER">
</column>
<column name="form_id" type="INTEGER"></column>
<column name="choosen_field" type="VARCHAR(255)"></column>
<column name="choosen_value" type="VARCHAR(255)"></column>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="false"/>
</column>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/></column>
</createTable>
<addColumn tableName="call">
<column name="initial_form" type="INTEGER"></column>
<column name="final_form" type="INTEGER"></column>
</addColumn>
</changeSet>
<changeSet id="13-09-2024_1" author="Harish Bagora">
<addColumn tableName="form_field">
<column name="description" type="TEXT">
<constraints nullable="true"/>
</column>
<column name="sort_order" type="INTEGER">
<constraints nullable="true"/>
</column>
</addColumn>
</changeSet>
<changeSet id="13-09-2024_2" author="Harish Bagora">
<sql>
TRUNCATE TABLE FORM_FIELD RESTART IDENTITY;
</sql>
<sqlFile dbms="postgresql"
path="classpath:db/dump/inserted_form_field_data_13_09_2024.sql" />
</changeSet>
<changeSet id="12-09-2024_1" author="Rajesh Khore">
<addColumn tableName="flow_edges">
<column name="tracking_id" type="VARCHAR(255)"></column>
</addColumn>
</changeSet>
</databaseChangeLog>

51
src/main/resources/db/dump/inserted_form_field_data_13_09_2024.sql Normal file
View File

@@ -0,0 +1,51 @@
INSERT INTO FORM_FIELD ( SORT_ORDER, NAME, LABEL, DESCRIPTION, SETTINGS, VALIDATORS, CREATED_DATE, UPDATED_DATE)
VALUES
( 1, 'textinput', 'Testo Breve', 'Per risposte concise (nomi, titoli, brevi descrizioni)',
'{"label": "Testo Breve", "placeholder": ""}',
'{"isRequired": false, "minLength": null, "maxLength": null, "pattern": null, "custom": null}',
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
( 2, 'textarea', 'Testo Lungo', 'Campo di testo esteso per paragrafi, descrizioni, proposte',
'{"label": "Testo Lungo", "placeholder": ""}',
'{"isRequired": false, "minLength": null, "maxLength": null, "pattern": null, "custom": null}',
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
( 3, 'wysiwyg', 'Campo di Testo Formattato', 'Editor avanzato per testo con formattazione',
'{"label": "Testo Formattato", "placeholder": ""}',
'{"isRequired": false, "minLength": null, "maxLength": null, "pattern": null, "custom": null}',
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
( 4, 'numberinput', 'Campo Numerico', 'Per l''inserimento di valori numerici (quantità, importi, percentuali)',
'{"label": "Numero", "placeholder": "0", "step": "0"}',
'{"isRequired": false, "min": null, "max": null, "pattern": null, "custom": null}',
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
(5, 'radio', 'Scelta Singola', 'Gruppo di opzioni per selezione singola',
'{"label": "Scelta Singola", "options": []}',
'{"isRequired": false, "custom": null}',
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
( 6, 'select', 'Menu a Tendina', 'Selezione da opzioni predefinite',
'{"label": "Menu a Tendina", "options": []}',
'{"isRequired": false, "custom": null}',
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
( 7, 'checkboxes', 'Scelta Multipla', 'Gruppo di opzioni per selezione singola o multipla',
'{"label": "Scelta Multipla", "options": []}',
'{"isRequired": false, "min": null, "max": null, "custom": null}',
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
( 8, 'switch', 'Casella di Spunta', 'Per selezioni binarie, accettazioni, conferme',
'{"label": "Casella di Spunta"}',
'{"isRequired": false}',
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
( 9, 'datepicker', 'Data', 'Selezione di data',
'{"label": "Data"}',
'{"isRequired": false, "custom": null}',
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
( 10, 'fileupload', 'Caricamento File', 'Per l''upload di documenti o immagini',
'{"label": "Caricamento File", "mime": []}',
'{"isRequired": false, "maxSize": 100000, "custom": null}',
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);

7
src/main/resources/message_en.properties
View File

@@ -133,3 +133,10 @@ lookupdata.value.cannot.be.empty=Value field cannot be empty
#Document-related message
document.updated.successfully=Document updated successfully.
document.fetched.successfully=Document fetched successfully.
#Flow-related message
flow.created.successfully=Flow created successfully.
flow.fetched.successfully=Flow fetched successfully.
flow.already.exists= Flow already exist for this call.
flow.request.not.complete=Flow request is not complete.
flow.not.found=Flow not found.

10
src/main/resources/message_it.properties
View File

@@ -56,7 +56,7 @@ status.same.error=Lo stato <20> gi<67> impostato.
invalid.status.change.from.draft=Lo stato non pu<70> essere cambiato in READY_TO_PUBLISH o PUBLISH da DRAFT.
status.cannot.be.changed=Lo stato non pu<70> essere cambiato.
published.call.not.update=Il bando pubblicato non pu<70> essere aggiornato.
invalid.status.change.from.publish=Lo stato non può essere modificato in READY_TO_PUBLISH o DRAFT da PUBLISH.
invalid.status.change.from.publish=Lo stato non pu<EFBFBD> essere modificato in READY_TO_PUBLISH o DRAFT da PUBLISH.
# Login-related messages
@@ -115,7 +115,7 @@ lookupdata.created.successfully=LookUpData creato correttamente.
lookupdata.fetched.successfully=LookUpData recuperato correttamente.
lookupdata.updated.successfully=LookUpData aggiornato correttamente.
lookupdata.deleted.successfully=LookUpData eliminato correttamente.
lookupdata.value.cannot.be.empty=Il campo valore non può essere vuoto
lookupdata.value.cannot.be.empty=Il campo valore non pu<EFBFBD> essere vuoto
#Document-related message
document.updated.successfully=Documento aggiornato con successo.
@@ -130,3 +130,9 @@ logout.successful.msg=Logout riuscito. Sei stato disconnesso con successo.
update.user.status.success=Lo stato dell'utente <20> stato aggiornato con successo.
#Flow-related message
flow.created.successfully=Flusso creato con successo.
flow.fetched.successfully=Flusso recuperato con successo.
flow.already.exists= Il flusso esiste gi<67> per questa chiamata.
flow.request.not.complete=La richiesta di flusso non <20> completa.
flow.not.found=Flow not found.