conflicts resolved

This commit is contained in:
harish
2024-08-26 12:29:18 +05:30
35 changed files with 341 additions and 190 deletions

View File

@@ -66,6 +66,9 @@
</column>
<column name="role_name" type="VARCHAR(255)">
<constraints nullable="false"/>
</column>
<column name="role_type" type="VARCHAR(255)">
<constraints nullable="false"/>
</column>
<column name="description" type="VARCHAR(255)">
<constraints nullable="true"/>
@@ -168,7 +171,6 @@
<column name="submission_method" type="TEXT">
</column>
<column name="threshold" type="INTEGER">
<constraints nullable="false"/>
</column>
<column name="priority_area" type="TEXT"/>
<column name="confidi" type="BOOLEAN"/>
@@ -314,7 +316,8 @@
<changeSet id="22-08-2024_2" author="Harish Bagora">
<!-- Insert data for Beneficiaries role -->
<insert tableName="role">
<column name="role_name" value="BENEFICIARIES"/>
<column name="role_name" value="beneficiary"/>
<column name="role_type" value="ROLE_BENEFICIARY"/>
<column name="description" value="Companies or individuals looking for financing opportunities. They can view, search, and apply to available calls."/>
<column name="created_date" value="2024-08-14 00:00:00"/>
<column name="updated_date" value="2024-08-14 00:00:00"/>
@@ -324,7 +327,8 @@
<!-- Insert data for Super Admin role -->
<insert tableName="role">
<column name="role_name" value="SUPER_ADMIN"/>
<column name="role_name" value="super admin"/>
<column name="role_type" value="ROLE_SUPER_ADMIN"/>
<column name="description" value="Manages the creation and publication of tenders and administers internal system users."/>
<column name="created_date" value="2024-08-14 00:00:00"/>
<column name="updated_date" value="2024-08-14 00:00:00"/>
@@ -334,7 +338,8 @@
<!-- Insert data for Pre-instructors role -->
<insert tableName="role">
<column name="role_name" value="PRE_INSTRUCTORS"/>
<column name="role_name" value="pre instructor"/>
<column name="role_type" value="ROLE_PRE_INSTRUCTOR"/>
<column name="description" value="They evaluate the applications sent by beneficiaries and manage the preliminary relief process."/>
<column name="created_date" value="2024-08-14 00:00:00"/>
<column name="updated_date" value="2024-08-14 00:00:00"/>
@@ -344,7 +349,8 @@
<!-- Insert data for Gepafin Operators role -->
<insert tableName="role">
<column name="role_name" value="GEPAFIN_OPERATORS"/>
<column name="role_name" value="gepafin operator"/>
<column name="role_type" value="ROLE_GEPAFIN_OPERATOR"/>
<column name="description" value="They manage the subsequent phases of the evaluation after the pre-investigation."/>
<column name="created_date" value="2024-08-14 00:00:00"/>
<column name="updated_date" value="2024-08-14 00:00:00"/>