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-08-30 18:54:16 +05:30
parent 18c40eaf03 98d1405a7c
commit 5ed23848bb
22 changed files with 202 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -514,4 +514,24 @@
from gepafin_schema.form_field), false)
</sql>
</changeSet>
<changeSet id="27-08-2024_3" author="Rajesh Khore">
<dropNotNullConstraint tableName="call" columnName="name"/>
<dropNotNullConstraint tableName="call" columnName="start_date"/>
<dropNotNullConstraint tableName="call" columnName="end_date"/>
<dropNotNullConstraint tableName="call" columnName="status"/>
<dropNotNullConstraint tableName="call" columnName="region_id"/>
<dropNotNullConstraint tableName="call" columnName="amount"/>
<dropNotNullConstraint tableName="call" columnName="amount_max"/>
</changeSet>
<changeSet id="29-08-2024_1" author="Harish Bagora">
<addColumn tableName="FAQ">
<column name="lookup_data_id" type="INTEGER">
<constraints nullable="false"
foreignKeyName="fk_lookup_data_faq"
references="lookup_data(id)" />
</column>
</addColumn>
</changeSet>
</databaseChangeLog>

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

@@ -55,7 +55,9 @@ update_call_status_success_msg=The call status has been updated successfully.
status.same.error=Status is already set.
invalid.status.change.from.draft=Status cannot be changed to READY_TO_PUBLISH or PUBLISH from DRAFT.
status.cannot.be.changed=Status cannot be changed.
invalid.status.transition=Invalid status transition.
published.call.not.update=Published call cannot be updated.
# Login-related messages
login.successfully=Login successfully.

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

@@ -55,7 +55,8 @@ update_call_status_success_msg=Lo stato della chiamata <20> stato aggiornato con
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.
invalid.status.transition=Transizione di stato non valida.
published.call.not.update=Il bando pubblicato non pu<70> essere aggiornato.
# Login-related messages
login.successfully=Accesso effettuato con successo.