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:
nisha
2024-10-22 19:54:51 +05:30
parent b1f9841557 d02283519b
commit 1f8abdc479
22 changed files with 575 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1212,6 +1212,38 @@
</column>
</addColumn>
</changeSet>
<changeSet id="21-10-2024_1" author="Harish Bagora">
<createTable tableName="assigned_applications">
<column autoIncrement="true" name="id" type="INTEGER">
<constraints nullable="false" primaryKey="true"
primaryKeyName="pk_assigned_applications"/>
</column>
<column name="user_id" type="INTEGER">
<constraints nullable="false"/>
</column>
<column name="assigned_by" type="INTEGER">
<constraints nullable="false"/>
</column>
<column name="application_id" type="INTEGER">
<constraints nullable="false" foreignKeyName="fk_application_assigned_applications" references="application(id)"/>
</column>
<column name="STATUS" type="VARCHAR(50)" />
<column name="note" type="TEXT"></column>
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
<column name="assigned_at" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="false"/>
</column>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/>
</column>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/>
</column>
</createTable>
</changeSet>
<changeSet id="17-10-2024_1" author="Rajesh Khore">
<!-- Step 1: Add the HUB_ID column as nullable initially -->

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

@@ -265,7 +265,12 @@ hub_delete_success=Hub deleted successfully
hub_not_found=Hub not found
application.not.in.draft.status=Application is not in DRAFT status.
application.already.assigned=Application is already assigned.
application.assigned.success.msg = Application assigned successfully.
application.already.assigned.msg = Application is already assigned.
aasigned.application.not.found=Assigned Application not found with the given ID.
assigned.application.deleted.success=Assigned Application successfully deleted.
assigned.application.get.success=Assigned Application details fetched successfully.
assigned.application.update.successfully=Assigned Application updated successfully.

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

@@ -253,6 +253,13 @@ cannot.create.beneficiary.user = La creazione di un utente beneficiario non <20>
evaluationCriteria.invalid=Questo criterio di valutazione non appartiene alla chiamata corrente.
application.assigned.success.msg =Domanda assegnata con successo
application.already.assigned.msg =La domanda <20> gi<67> assegnata
aasigned.application.not.found = Applicazione assegnata non trovata con l'ID specificato.
assigned.application.deleted.success =Applicazione assegnata eliminata con successo.
assigned.application.get.success =Dettagli dell'applicazione assegnata recuperati correttamente.
assigned.application.update.successfully = Applicazione assegnata aggiornata correttamente.
# Hub Messages
hub_create_success=Hub creato con successo
hub_update_success=Hub aggiornato con successo
@@ -261,5 +268,4 @@ hub_get_all_success=Hub recuperati con successo
hub_delete_success=Hub eliminato con successo
hub_not_found=Hub non trovato
application.not.in.draft.status=La domanda non è in stato DRAFT.
application.already.assigned=L'applicazione è già assegnata.
application.not.in.draft.status=La domanda non <EFBFBD> in stato DRAFT.