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 03:02:20 +05:30
parent f96fcd3a76 c702bcda75
commit 5fc8206ecf
50 changed files with 1687 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -434,4 +434,12 @@
</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>

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

@@ -47,8 +47,8 @@ call.created.successfully=Call created successfully.
call.invalid.date=Invalid start or end date.
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.
# Login-related messages
login.successfully=Login successfully.
@@ -61,7 +61,41 @@ invalid_signature=Invalid token.
invalid_login=Invalid username or password.
req_validation_er=Request Validation Error
#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.
#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.

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

@@ -47,6 +47,7 @@ call.invalid.date=Data di inizio o fine non valida.
call.update.successfully=Chiamata aggiornata con successo.
call.fetch.success=Dettagli della chiamata recuperati con successo.
call.not.found=Chiamata non trovata.
score.not.null=Il punteggio non pu<70> essere nullo o zero.
# Login-related messages
login.successfully=Accesso effettuato con successo.
@@ -58,3 +59,38 @@ common_message=qualcosa é andato storto. Per favore riprova
invalid_signature=Gettone non valido.
invalid_login=Nome utente o password errati
req_validation_er=Errore di convalida
#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.