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-28 15:38:56 +05:30
parent d1bcc36c41 60bd39360e
commit ae626f8d14
85 changed files with 2713 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -456,4 +456,51 @@
</changeSet>
<changeSet id="27-08-2024_1" author="Rajesh Khore">
<dropColumn tableName="EVALUATION_CRITERIA"
columnName="name" />
<dropColumn tableName="EVALUATION_CRITERIA"
columnName="description" />
<addColumn tableName="EVALUATION_CRITERIA">
<column name="lookup_data_id" type="INTEGER">
<constraints nullable="false"
foreignKeyName="fk_lookup_data_evaluation_criteria"
references="lookup_data(id)" />
</column>
</addColumn>
</changeSet>
<changeSet id="27-08-2024_2" author="Rajesh Khore">
<addColumn tableName="FAQ">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="CALL_TARGET_AUDIENCE_CHECKLIST">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="EVALUATION_CRITERIA">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="DOCUMENT">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
</changeSet>
<changeSet id="23-08-2024_1" author="Harish Bagora">
<addColumn tableName="gepafin_user">
<column name="reset_password_token" type="VARCHAR(255)">
<constraints nullable="true"/>
</column>
</addColumn>
</changeSet>
</databaseChangeLog>

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

@@ -44,8 +44,13 @@ file.deleted.successfully=File deleted successfully.
document.not.found=Document not found.
document.id.not.found=Document ID not found.
call.invalid.date=Invalid start or end date.
call.not.found=Call not found.
call.id.not.null=Call id cannot be null.
call.update.successfully=Call updated successfully.
call.fetch.success=Call details fetched successfully.
call.not.found=Call not found.
score.not.null=Score cannot be null or cannot be zero.
field.not.null={0} cannot be null.
field.not.empty={0} cannot be empty.
# Login-related messages
login.successfully=Login successfully.
@@ -66,6 +71,23 @@ form.deleted.successfully=Form deleted successfully.
form.fetched.successfully=Form fetched successfully.
required.parameter.not.found.for.form=Label, content, or orderNo cannot be null.
form.not.found.for.call.id=Form not found for corresponding call.
#EvaluationCriteria-related messages
evaluation.criteria.not.found=EvaluationCriteria not found.
evaluation.criteria.created.successfully=EvaluationCriteria created successfully.
evaluation.criteria.fetch.successfully=EvaluationCriteria fetched successfully.
evaluation.criteria.updated.successfully=EvaluationCriteria updated successfully.
evaluation.criteria.deleted.successfully=EvaluationCriteria deleted successfully.
# Password reset messages
password.reset.initiated=Password reset initiated.
password.reset.success=Password has been successfully reset.
#Change Password
invalid.token.msg=The token provided is invalid or expired. Please request a new token.
current.password.incorrect = Current password is incorrect.
success.password.changed=Password changed successfully.
#Logout
logout.successful.msg=Logout successful. You have been logged out successfully.
#Update user Active or Deactive status
update.user.status.success=User status has been successfully updated.
#Form-field-related messages
@@ -83,4 +105,21 @@ form.template.created.successfully=Form template created successfully.
form.template.updated.suucessfully=Form template updated successfully.
form.template.deleted.successfully=Form template deleted successfully.
form.template.fetched.successfully=Form template fetched successfully.
required.parameter.not.found.for.form.template=Label or content cannot be null.
required.parameter.not.found.for.form.template=Label or content cannot be null.
#Faq-related messages
faq.not.found=Faq not found.
faq.created.successfully=Faq created successfully.
faq.fetched.successfully=Faq fetched successfully.
faq.updated.successfully=Faq updated successfully.
faq.deleted.successfully=Faq deleted successfully.
#LookUpData-related message
lookupdata.not.found=LookUpData not found.
lookupdata.created.successfully=LookUpData created successfully.
lookupdata.fetched.successfully=LookUpData fetched successfully.
lookupdata.updated.successfully=LookUpData updated successfully.
lookupdata.deleted.successfully=LookUpData deleted successfully.
#Document-related message
document.updated.successfully=Document updated successfully.
document.fetched.successfully=Document fetched successfully.

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

@@ -44,8 +44,13 @@ file.deleted.successfully=File eliminato con successo.
document.not.found=Documento non trovato.
document.id.not.found=ID documento non trovato.
call.invalid.date=Data di inizio o fine non valida.
call.id.not.null=L'ID della chiamata non pu<70> essere nullo.
call.update.successfully=Chiamata aggiornata con successo.
call.fetch.success=Dettagli della chiamata recuperati con successo.
call.not.found=Chiamata non trovata.
call.id.not.null=L'ID della chiamata non può essere nullo.
score.not.null=Il punteggio non pu<EFBFBD> essere nullo o zero.
field.not.null={0} non pu<70> essere nullo.
field.not.empty=la {0} non pu<70> essere vuota.
# Login-related messages
login.successfully=Accesso effettuato con successo.
@@ -82,3 +87,37 @@ form.template.updated.suucessfully=Modello di modulo aggiornato correttamente.
form.template.deleted.successfully=Modello di modulo eliminato correttamente.
form.template.fetched.successfully=Modello di modulo recuperato correttamente.
required.parameter.not.found.for.form.template=Etichetta o contenuto non possono essere nulli.
#EvaluationCriteria-related messages
evaluation.criteria.not.found=EvaluationCriteria non trovato.
evaluation.criteria.created.successfully=EvaluationCriteria creato con successo.
evaluation.criteria.fetch.successfully=Recupero EvaluationCriteria riuscito.
evaluation.criteria.updated.successfully=EvaluationCriteria aggiornato con successo.
evaluation.criteria.deleted.successfully=EvaluationCriteria eliminato con successo.
#faq-related messages
faq.not.found=Faq non trovata.
faq.created.successfully=Faq creata con successo.
faq.fetched.successfully=Faq recuperata con successo.
faq.updated.successfully=Faq aggiornata con successo.
faq.deleted.successfully=Faq eliminata con successo.
#LookUpData-related message
lookupdata.not.found=LookUpData non trovato.
lookupdata.created.successfully=LookUpData creato correttamente.
lookupdata.fetched.successfully=LookUpData recuperato correttamente.
lookupdata.updated.successfully=LookUpData aggiornato correttamente.
lookupdata.deleted.successfully=LookUpData eliminato correttamente.
#Document-related message
document.updated.successfully=Documento aggiornato con successo.
document.fetched.successfully=Documento recuperato con successo.
# Password reset messages
password.reset.initiated=Reimpostazione della password avviata.
password.reset.success=La password <20> stata reimpostata con successo.
invalid.token.msg=Il token fornito <20> invalido o scaduto. Si prega di richiedere un nuovo token.
current.password.incorrect = La password attuale non <20> corretta.
success.password.changed=Password cambiata con successo.
logout.successful.msg=Logout riuscito. Sei stato disconnesso con successo.
update.user.status.success=Lo stato dell'utente <20> stato aggiornato con successo.