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:
Piyush
2025-02-10 16:04:43 +05:30
parent e9200c6fb3 2374b802e0
commit 10df658e0e
64 changed files with 1794 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/application-production.properties
View File

@@ -16,7 +16,7 @@ spid.ipd.base.url=https://login.regione.umbria.it
active.profile.folder=production
isMailSendingEnabled = true
default_System_Receiver_Email=c.moretti@gepafin.it
default_System_Receiver_Email=m.gaudino@gepafin.it,f.marinelli@gepafin.it
gepafin_email=bandi@pec.gepafin.it
rinaldo_email=rinaldo.bonazzo@bflows.net
carlo_email=carlo.mancosu@bflows.net

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

@@ -2303,7 +2303,94 @@
<column name="application_evaluation_id" valueComputed="(SELECT ae.id FROM application_evaluation ae WHERE ae.application_id = application.id)"/>
<where>EXISTS (SELECT 1 FROM application_evaluation ae WHERE ae.application_id = application.id)</where>
</update>
</changeSet>
</changeSet>
<changeSet id="27-01-2025_RK_130515" author="Rajesh Khore">
<createTable tableName="application_evaluation_form">
<column name="id" type="INTEGER" autoIncrement="true">
<constraints nullable="false" primaryKey="true" primaryKeyName="application_evaluation_form_pkey"/>
</column>
<column name="application_id" type="BIGINT">
<constraints nullable="true"/>
</column>
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
<column name="evaluation_id" type="INTEGER">
<constraints nullable="false" foreignKeyName="fk_application_evaluation_form_application_evaluation"
references="application_evaluation(id)"/>
</column>
<column name="evaluation_form_id" type="INTEGER">
<constraints nullable="false" foreignKeyName="fk_application_evaluation_form_evaluation_form"
references="evaluation_form(id)"/>
</column>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="false"/>
</column>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/>
</column>
</createTable>
</changeSet>
<changeSet id="27-01-2025_RK_131020" author="Rajesh Khore">
<createTable tableName="application_evaluation_form_field">
<column name="id" type="INTEGER" autoIncrement="true">
<constraints nullable="false" primaryKey="true" primaryKeyName="application_evaluation_form_field_pkey"/>
</column>
<column name="application_evaluation_form_id" type="INTEGER">
<constraints nullable="false" foreignKeyName="fk_application_evaluation_form_application_evaluation_form_field"
references="application_evaluation_form(id)"/>
</column>
<column name="field_id" type="VARCHAR(255)">
<constraints nullable="true"/>
</column>
<column name="field_value" type="VARCHAR(255)">
<constraints nullable="true"/>
</column>
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="false"/>
</column>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/>
</column>
</createTable>
</changeSet>
<changeSet id="30-01-2025_RK_113515" author="Rajesh Khore">
<modifyDataType
tableName="application_evaluation_form_field"
columnName="field_value"
newDataType="TEXT"/>
</changeSet>
<changeSet id="03-01-2025_PK_124115" author="Rajesh Khore">
<addColumn tableName="application_evaluation">
<column name="evaluation_version" type="VARCHAR(255)" defaultValue="V1">
<constraints nullable="false"/>
</column>
</addColumn>
</changeSet>
<changeSet id="04-02-2025_RK_174000" author="Rajesh Khore">
<sqlFile dbms="postgresql"
path="db/dump/update_system_email_template_application_rejected_04_02_2025.sql"/>
</changeSet>
<changeSet id="06-02-2025_NK_155519" author="Nisha Kashyap">
<addColumn tableName="call">
<column name="number_of_check" type="numeric"></column>
<column name="product_id" type="numeric"></column>
</addColumn>
</changeSet>
<changeSet id="06-02-2025_PK_165700" author="Piyush Kag">
<sqlFile dbms="postgresql"
path="db/dump/update_form_field_data_06-02-2025.sql"/>
</changeSet>
</databaseChangeLog>

14
src/main/resources/db/dump/update_form_field_data_06-02-2025.sql Normal file
View File

@@ -0,0 +1,14 @@
INSERT INTO FORM_FIELD (ID, SORT_ORDER, NAME, LABEL, DESCRIPTION, SETTINGS, VALIDATORS, CREATED_DATE, UPDATED_DATE)
VALUES
(
22,
22,
'switch',
'Casella di spunta "Checklist"',
'Per selezioni binarie, accettazioni, conferme',
'[{"name":"label","value":"Casella di Spunta"},{"name":"isChecklistItem","value":true}]',
'{"isRequired":false}',
CURRENT_TIMESTAMP,
CURRENT_TIMESTAMP
);

17
src/main/resources/db/dump/update_system_email_template_application_rejected_04_02_2025.sql Normal file
View File

@@ -0,0 +1,17 @@
UPDATE gepafin_schema.system_email_template
SET html_content = '<html>
<body style="font-family: Arial, sans-serif; color: #000; line-height: 1.6;">
<div style="padding: 20px; border: 1px solid #ddd; border-radius: 8px; max-width: 600px; margin: auto;">
<p>Buongiorno,</p>
<p>Si comunica che, in riferimento alla domanda a valere sul bando “<strong>{{call_name}}</strong>” di cui al
<strong>Protocollo n. {{protocol_number}} del {{protocol_date}} alle {{protocol_time}}</strong>,
la stessa è stata sottoposta ad istruttoria di ammissibilità con esito negativo.</p>
<p>Le motivazioni sono le seguenti: <strong>{{form_text}}</strong></p>
<p>Vi ricordiamo che i Beneficiari che hanno presentato richieste valutate non ammissibili entro 10 giorni dalla data di ricevimento della presente potranno formulare ricorso al Gestore tramite modello disponibile nello sportello online
<a href="{{platform_link}}">{{platform_link}}</a>.</p>
<p>Distinti Saluti,</p>
<p><strong>{{email_signature}}</strong></p>
</div>
</body>
</html>'
WHERE "type" = 'INADMISSIBILITY_NOTIFICATION';

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

@@ -152,6 +152,7 @@ application.created.success=Application successfully created.
application.updated.success=Application successfully updated.
application.deleted.success=Application successfully deleted.
application.get.success=Application details fetched successfully.
application.evaluation.version.get.success = Application evaluation version fetched successfully.
application.not.found=Application not found with the given ID.
application.form.field.not.found=Application form field not found.
Form.not.matches.to.call.initial.form=Form id does not matches to initial form id of call.
@@ -267,6 +268,7 @@ evaluationCriteria.invalid=This evaluation criterion does not belong to the curr
assigned.application.not.found.with.id=Assigned application with this application ID not found
either.application.or.assigned.application.id.required=Either applicationId or assignedApplicationId is required.
evaluation.already.exists=An application evaluation already exists for this application ID.
application.evaluation.form.get.success = Application Evaluation Form Fetched Successfully.
# Hub Messages
hub_create_success=Hub created successfully
@@ -362,8 +364,11 @@ evaluation.form.deleted.successfully=Evaluation form deleted successfully.
evaluation.form.fetched.successfully=Evaluation form fetched successfully.
evaluation.form.not.found=Evaluation form not found.
either.applicationId.or.assignedApplicationId.must.be.provided=Either applicationId or assignedApplicationId must be provided.
assigned.application.status.updated.successfully=Assigned application status updated successfully.
validation.required.requested.amount=The Requested Amount configuration should be mandatory.
company.id.not.null=Company ID cannot be null.
formula.amount.not.matches.requested.amount= The {0} does not matches to calculated amount.

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

@@ -146,6 +146,7 @@ application.created.success=Applicazione creata con successo.
application.updated.success=Applicazione aggiornata con successo.
application.deleted.success=Applicazione eliminata con successo.
application.get.success=Dettagli dell'applicazione recuperati con successo.
application.evaluation.version.get.success = Versione di valutazione dell'applicazione recuperata correttamente.
application.not.found=Applicazione non trovata con l'ID fornito.
application.form.field.not.found=Campo del modulo di domanda non trovato.
Form.not.matches.to.call.initial.form=L'ID del modulo non corrisponde all'ID del modulo iniziale della chiamata.
@@ -260,6 +261,7 @@ application.evaluation.status.updated.successfully=Stato della valutazione dell'
assigned.application.not.found.with.id=Applicazione assegnata con questo ID dell'applicazione non trovata
either.application.or.assigned.application.id.required=? richiesto almeno uno tra applicationId o assignedApplicationId.
evaluation.already.exists=Una valutazione dell'applicazione esiste gi? per questo ID applicazione.
application.evaluation.form.get.success =Modulo di valutazione della domanda recuperato correttamente.code
application.assigned.success.msg =Domanda assegnata con successo
application.already.assigned.msg =La domanda ? gi? assegnata
@@ -352,10 +354,12 @@ evaluation.form.deleted.successfully=Modulo di valutazione eliminato con success
evaluation.form.fetched.successfully=Modulo di valutazione recuperato con successo.
evaluation.form.not.found=Modulo di valutazione non trovato.
either.applicationId.or.assignedApplicationId.must.be.provided = "<22> necessario fornire applicationId o assegnatoApplicationId."
assigned.application.status.updated.successfully=Stato dell'applicazione assegnata aggiornato con successo.
validation.required.requested.amount=La configurazione dell'importo richiesto è obbligatoria.
validation.required.requested.amount=La configurazione dell'importo richiesto <EFBFBD> obbligatoria.
company.id.not.null=L'ID dell'azienda non pu? essere nullo.
formula.amount.not.matches.requested.amount=Il {0} non corrisponde all'importo calcolato.