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

Resolve Conflicts

Browse Source
This commit is contained in:
nishainnogent
2024-11-29 11:53:10 +05:30
parent 20f865ee4b 629f7831a4
commit d8066aa61d
24 changed files with 438 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1787,6 +1787,22 @@
</dropColumn>
</changeSet>
<changeSet id="25-11-2024_1" author="Nisha Kashyap">
<addColumn tableName="application_evaluation">
<column name="initial_days" type="INTEGER"></column>
<column name="remaining_days" type="INTEGER"></column>
<column name="suspended_days" type="INTEGER"></column>
<column name="start_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
<column name="end_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
<column name="stop_date_time" type="TIMESTAMP WITHOUT TIME ZONE"></column>
</addColumn>
</changeSet>
<changeSet id="25-11-2024_2" author="Nisha kashyap">
<addColumn tableName="application_amendment_request">
<column name="end_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
</addColumn>
</changeSet>
<changeSet id="20-11-2024_1" author="Piyush">
<createTable tableName="user_action">
<column autoIncrement="true" name="id" type="INTEGER">

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

@@ -310,3 +310,6 @@ application.documents.not.found=No documents found for the application.
beneficiary.call.duplicate = A preferred call with this call ID and company ID already exists for this user.
user.must.be.associated.with.company.to.create.application=You must be associated with a company to apply for this application.
company.id.required.for.preferred.call=Company ID is required when requesting only preferred calls.
response.days.not.null=Response days should not be null and greater than zero.
application.cannot.approved.or.rejected=Application cannot be approved and rejected because amendment is active.

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

@@ -305,3 +305,5 @@ application.documents.not.found=Nessun documento trovato per la domanda.
beneficiary.call.duplicate = Una chiamata preferita con questo ID di chiamata e ID azienda esiste gi� per questo utente.
user.must.be.associated.with.company.to.create.application=Devi essere associato a un'azienda per poter presentare domanda per questa applicazione.
company.id.required.for.preferred.call=ID azienda obbligatorio quando si richiedono solo chiamate preferite.
response.days.not.null=I giorni di risposta non devono essere nulli e maggiori di zero.
application.cannot.approved.or.rejected=La domanda non può essere approvata o rifiutata perché l'emendamento è attivo.