resolved conflicts

2024-09-15 12:18:42 +05:30
parent 60e51808c0 4bfe26077a
commit 8ebd418441
37 changed files with 382 additions and 129 deletions
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -540,15 +540,15 @@
 			columnName="order_no" />
 	</changeSet>
 	
-	<changeSet id="03-09-2024_1" author="Rajesh Khore">
-	    <sql>
-	        TRUNCATE TABLE FORM_FIELD RESTART IDENTITY;
-	    </sql>
-	     <sqlFile dbms="postgresql"
+    <changeSet id="03-09-2024_1" author="Rajesh Khore">
+        <sql>
+            TRUNCATE TABLE FORM_FIELD RESTART IDENTITY;
+        </sql>
+        <sqlFile dbms="postgresql"
                 path="db/dump/update_form_field_data_04_09_2024.sql" />
-	</changeSet>
-	
-	<changeSet id="04-09-2024_1" author="Rajesh Khore">
+    </changeSet>
+
+    <changeSet id="04-09-2024_1" author="Rajesh Khore">
 		<dropColumn tableName="FAQ" columnName="question_short" />
 		<dropColumn tableName="FAQ" columnName="question" />
 		<dropColumn tableName="FAQ" columnName="response_short" />
@@ -564,6 +564,15 @@
 		<modifyDataType tableName="LOOKUP_DATA" columnName="title" newDataType="TEXT"/>
 	</changeSet>

+    <changeSet id="09-09-2024_2" author="Harish Bagora">
+        <renameColumn tableName="document" oldColumnName="call_id" newColumnName="source_id" columnDataType="BIGINT"/>
+        <addColumn tableName="document">
+            <column name="source" type="VARCHAR(255)"/>
+        </addColumn>
+        <dropColumn tableName="document" columnName="description"/>
+        <dropForeignKeyConstraint baseTableName="document" constraintName="fk_call_document"/>
+    </changeSet>
+
    <changeSet id="09-09-2024_1" author="Rajesh Khore">
        <createTable tableName="application_form">
            <column name="id" type="INTEGER" autoIncrement="true">
@@ -669,4 +678,28 @@
        </dropColumn>
    </changeSet>

+    <changeSet id="13-09-2024_1" author="Harish Bagora">
+        <addColumn tableName="form_field">
+            <column name="description" type="TEXT">
+                <constraints nullable="true"/>
+            </column>
+            <column name="sort_order" type="INTEGER">
+                <constraints nullable="true"/>
+            </column>
+        </addColumn>
+    </changeSet>
+    <changeSet id="13-09-2024_2" author="Harish Bagora">
+        <sql>
+            TRUNCATE TABLE FORM_FIELD RESTART IDENTITY;
+        </sql>
+        <sqlFile dbms="postgresql"
+                 path="classpath:db/dump/inserted_form_field_data_13_09_2024.sql" />
+    </changeSet>
+
+    
+    <changeSet id="12-09-2024_1" author="Rajesh Khore">
+        <addColumn tableName="flow_edges">
+            <column name="tracking_id" type="VARCHAR(255)"></column>
+        </addColumn>
+    </changeSet>
 </databaseChangeLog>
--- a/src/main/resources/db/dump/inserted_form_field_data_13_09_2024.sql
+++ b/src/main/resources/db/dump/inserted_form_field_data_13_09_2024.sql
@@ -0,0 +1,51 @@
+INSERT INTO FORM_FIELD ( SORT_ORDER, NAME, LABEL, DESCRIPTION, SETTINGS, VALIDATORS, CREATED_DATE, UPDATED_DATE)
+VALUES
+( 1, 'textinput', 'Testo Breve', 'Per risposte concise (nomi, titoli, brevi descrizioni)',
+    '{"label": "Testo Breve", "placeholder": ""}',
+    '{"isRequired": false, "minLength": null, "maxLength": null, "pattern": null, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+( 2, 'textarea', 'Testo Lungo', 'Campo di testo esteso per paragrafi, descrizioni, proposte',
+    '{"label": "Testo Lungo", "placeholder": ""}',
+    '{"isRequired": false, "minLength": null, "maxLength": null, "pattern": null, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+( 3, 'wysiwyg', 'Campo di Testo Formattato', 'Editor avanzato per testo con formattazione',
+    '{"label": "Testo Formattato", "placeholder": ""}',
+    '{"isRequired": false, "minLength": null, "maxLength": null, "pattern": null, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+( 4, 'numberinput', 'Campo Numerico', 'Per l''inserimento di valori numerici (quantità, importi, percentuali)',
+    '{"label": "Numero", "placeholder": "0", "step": "0"}',
+    '{"isRequired": false, "min": null, "max": null, "pattern": null, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(5, 'radio', 'Scelta Singola', 'Gruppo di opzioni per selezione singola',
+    '{"label": "Scelta Singola", "options": []}',
+    '{"isRequired": false, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+( 6, 'select', 'Menu a Tendina', 'Selezione da opzioni predefinite',
+    '{"label": "Menu a Tendina", "options": []}',
+    '{"isRequired": false, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+( 7, 'checkboxes', 'Scelta Multipla', 'Gruppo di opzioni per selezione singola o multipla',
+    '{"label": "Scelta Multipla", "options": []}',
+    '{"isRequired": false, "min": null, "max": null, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+( 8, 'switch', 'Casella di Spunta', 'Per selezioni binarie, accettazioni, conferme',
+    '{"label": "Casella di Spunta"}',
+    '{"isRequired": false}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+( 9, 'datepicker', 'Data', 'Selezione di data',
+    '{"label": "Data"}',
+    '{"isRequired": false, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+( 10, 'fileupload', 'Caricamento File', 'Per l''upload di documenti o immagini',
+    '{"label": "Caricamento File", "mime": []}',
+    '{"isRequired": false, "maxSize": 100000, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
--- a/src/main/resources/message_en.properties
+++ b/src/main/resources/message_en.properties
@@ -159,3 +159,4 @@ validation.field.not_null=Field {0} must not be null.
 validation.field.not_empty=Field {0} must not be empty.

 current.form.incomplete=Current form is not filled.
+flow.not.found=Flow not found.
--- a/src/main/resources/message_it.properties
+++ b/src/main/resources/message_it.properties
@@ -144,7 +144,7 @@ application.get.success=Dettagli dell'applicazione recuperati con successo.
 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.
-application.already.exists=L'applicazione esiste già per questa chiamata.
+application.already.exists=L'applicazione esiste gi<EFBFBD> per questa chiamata.

 #Validation related messages
 validation.field.required=Il campo {0} <20> obbligatorio.
@@ -153,4 +153,5 @@ validation.field.max_length=Il campo {0} deve essere lungo al massimo {1} caratt
 validation.field.pattern=Il campo {0} non corrisponde al modello richiesto.
 validation.field.not_null=Il campo {0} non deve essere nullo.
 validation.field.not_empty=Il campo {0} non deve essere vuoto.
-current.form.incomplete=il modulo corrente non è compilato
+current.form.incomplete=il modulo corrente non <EFBFBD> compilato
+flow.not.found=Flow not found.