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

Resolved conficts

Browse Source
This commit is contained in:
rajesh
2024-12-12 14:54:57 +05:30
parent e97b12e1f7 3937fb76f1
commit 0bcd871a83
24 changed files with 453 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1991,7 +1991,7 @@
<column name="document_attachment_id" type="TEXT"/>
</addColumn>
</changeSet>
<changeSet id="12-12-2024_1" author="Rajesh Khore">
<changeSet id="12-12-2024_2" author="Rajesh Khore">
<insert tableName="s3_path_configuration">
<column name="type" value="EVALUATION"/>
<column name="path" value="call/{call_id}/application/{application_id}/evaluation"/>
@@ -2018,6 +2018,15 @@
<column name="uploaded_by" type="INTEGER">
<!-- <constraints nullable="false"/>-->
</column>
</addColumn>
</changeSet>
<changeSet id="12_12_2024_1" author="Nisha Kashyap">
<addColumn tableName="protocol">
<column name="type" type="VARCHAR(255)"></column>
</addColumn>
<addColumn tableName="application_amendment_request">
<column name="amendment_document" type="TEXT"></column>
</addColumn>
</changeSet>
</databaseChangeLog>

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

@@ -320,7 +320,7 @@ atleast.one.id.required=At least one of companyId or applicationId must be provi
ndg.generated = NDG Generated.
ndg.available = NDG Available.
ndg.generation.in.progress = NDG generation is in progress.
ndg.fetch.successfully = NDG fetch successfully.
ndg.fetch.successfully = NDG fetched successfully.
appointment.already.created = Appointment Already Created.
ndg.not.found.for.this.application.or.invalid = Ndg not found for this application or invalid.
provide.valid.application.document.id = Provide valid application document id.
@@ -334,3 +334,5 @@ appointment.creation.is.only.for.gepafin = Appointment creation is only allowed
upload.document.is.only.for.gepafin = Document cant be uploaded, this is only available for GEPAFIN Hub.
appointment.created.successfully = Appointment created successfully.
error.try.again = Service call error while performing the operation. Please try again.
document.uploading.is.in.progress = Document uploading is in progress.
all.document.checked.and.one.checklist.checked=All document should be checked and at least one checklist should be checked.

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

@@ -310,7 +310,7 @@ atleast.one.id.required=Almeno uno tra companyId o applicationId deve essere for
#Appointment flow messages
ndg.available = NDG disponibile.
ndg.generation.in.progress = La generazione NDG ? in corso.
ndg.fetch.successfully = Recupero NDG riuscito.
ndg.fetch.successfully = NDG recuperato con successo.
appointment.already.created = Appuntamento gi? creato.
ndg.not.found.for.this.application.or.invalid = NDG non trovato per questa applicazione o non valido.
provide.valid.application.document.id = Fornisci un ID documento applicativo valido.
@@ -324,3 +324,5 @@ appointment.creation.is.only.for.gepafin = La creazione degli appuntamenti ? con
upload.document.is.only.for.gepafin = Il documento non pu? essere caricato, questa operazione ? disponibile solo per il Hub GEPAFIN.
appointment.created.successfully = Appuntamento creato con successo.
error.try.again = Errore di chiamata di servizio durante l'esecuzione dell'operazione. Riprovare.
document.uploading.is.in.progress = Il documento è in fase di caricamento.
all.document.checked.and.one.checklist.checked=Tutti i documenti devono essere controllati e almeno una checklist deve essere controllata.