resolved conflicts

src/main/resources/db/changelog/db.changelog-1.0.0.xml

@@ -1135,6 +1135,44 @@
         <column name="country" value="Italy"/>
     </insert>
     </changeSet>
+    
+    <changeSet id="16-10-2024_2" author="Rajesh Khore">
+    
+        <createTable tableName="criteria_form_field">
+            <column autoIncrement="true" name="id" type="INTEGER">
+                <constraints nullable="false" primaryKey="true"
+                             primaryKeyName="criteria_form_field_pkey" />
+            </column>
+            <column name="call_id" type="INTEGER" />
+            <column name="form_id" type="INTEGER" />
+            <column name="form_field_id" type="varchar(255)" />
+            <column name="evaluation_criteria_id" type="INTEGER" />
+            <column name="IS_DELETED" type="BOOLEAN" defaultValueBoolean="true">
+	            <constraints nullable="false"/>
+	        </column>
+            <column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE" />
+        	<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE" />
+        </createTable>
+
+        <addForeignKeyConstraint baseTableName="criteria_form_field"
+                                 baseColumnNames="call_id"
+                                 referencedTableName="call"
+                                 referencedColumnNames="id"
+                                 constraintName="fk_criteria_form_field_call_id"/>
+
+        <addForeignKeyConstraint baseTableName="criteria_form_field"
+                                 baseColumnNames="form_id"
+                                 referencedTableName="form"
+                                 referencedColumnNames="id"
+                                 constraintName="fk_criteria_form_field_form_id"/>
+
+        <addForeignKeyConstraint baseTableName="criteria_form_field"
+                                 baseColumnNames="evaluation_criteria_id"
+                                 referencedTableName="evaluation_criteria"
+                                 referencedColumnNames="id"
+                                 constraintName="fk_criteria_form_field_evaluation_criteria_id"/>
+    </changeSet>
+    
     <changeSet id="16-10-2024_1" author="Harish Bagora">
         <addColumn tableName="user_with_company">
             <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">

src/main/resources/message_en.properties

@@ -253,6 +253,8 @@ get_login_attempt_se_msg=Login attempts fetched successfully.
 application.in.submit.status.cannot.delete.company=The company cannot be deleted because there are active applications in the SUBMITTED status.
 get.users.success.msg = Successfully fetched users.
 cannot.create.beneficiary.user = Creation of a Beneficiary user is not allowed. Please assign the appropriate role.
+evaluationCriteria.invalid=This evaluation criterion does not belong to the current call.
+
 
 # Hub Messages
 hub_create_success=Hub created successfully

src/main/resources/message_it.properties

@@ -250,6 +250,8 @@ application.in.submit.status.cannot.delete.company=Non <20> possibile eliminare l
 
 get.users.success.msg = Utenti recuperati con successo
 cannot.create.beneficiary.user = La creazione di un utente beneficiario non <20> consentita. Si prega di assegnare il ruolo appropriato.
+evaluationCriteria.invalid=Questo criterio di valutazione non appartiene alla chiamata corrente.
+
 
 # Hub Messages
 hub_create_success=Hub creato con successo